| Message ID | 20161028014055.31966-1-philipl@overt.org |
|---|---|
| State | Accepted |
| Commit | 7c27da686c06d219258270643088d2f9b393b585 |
| Headers | show |
On 28.10.2016 03:40, Philip Langdale wrote: > This avoids it getting picked by default, which is generally > undesirable and can break test runs. > > Signed-off-by: Philip Langdale <philipl@overt.org> > --- > libavcodec/allcodecs.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/libavcodec/allcodecs.c b/libavcodec/allcodecs.c > index b592aa3..594d104 100644 > --- a/libavcodec/allcodecs.c > +++ b/libavcodec/allcodecs.c > @@ -261,10 +261,10 @@ void avcodec_register_all(void) > REGISTER_DECODER(MPEG2_CRYSTALHD, mpeg2_crystalhd); > REGISTER_DECODER(MPEG2_QSV, mpeg2_qsv); > REGISTER_DECODER(MSA1, msa1); > - REGISTER_DECODER(MSMPEG4_CRYSTALHD, msmpeg4_crystalhd); > REGISTER_DECODER(MSMPEG4V1, msmpeg4v1); > REGISTER_ENCDEC (MSMPEG4V2, msmpeg4v2); > REGISTER_ENCDEC (MSMPEG4V3, msmpeg4v3); > + REGISTER_DECODER(MSMPEG4_CRYSTALHD, msmpeg4_crystalhd); > REGISTER_DECODER(MSRLE, msrle); > REGISTER_DECODER(MSS1, mss1); > REGISTER_DECODER(MSS2, mss2); > LGTM. Best regards, Andreas
On Sat, 29 Oct 2016 00:59:23 +0200 Andreas Cadhalpun <andreas.cadhalpun@googlemail.com> wrote: > On 28.10.2016 03:40, Philip Langdale wrote: > > This avoids it getting picked by default, which is generally > > undesirable and can break test runs. > > > > Signed-off-by: Philip Langdale <philipl@overt.org> > > --- > > libavcodec/allcodecs.c | 2 +- > > 1 file changed, 1 insertion(+), 1 deletion(-) > > > > diff --git a/libavcodec/allcodecs.c b/libavcodec/allcodecs.c > > index b592aa3..594d104 100644 > > --- a/libavcodec/allcodecs.c > > +++ b/libavcodec/allcodecs.c > > @@ -261,10 +261,10 @@ void avcodec_register_all(void) > > REGISTER_DECODER(MPEG2_CRYSTALHD, mpeg2_crystalhd); > > REGISTER_DECODER(MPEG2_QSV, mpeg2_qsv); > > REGISTER_DECODER(MSA1, msa1); > > - REGISTER_DECODER(MSMPEG4_CRYSTALHD, msmpeg4_crystalhd); > > REGISTER_DECODER(MSMPEG4V1, msmpeg4v1); > > REGISTER_ENCDEC (MSMPEG4V2, msmpeg4v2); > > REGISTER_ENCDEC (MSMPEG4V3, msmpeg4v3); > > + REGISTER_DECODER(MSMPEG4_CRYSTALHD, msmpeg4_crystalhd); > > REGISTER_DECODER(MSRLE, msrle); > > REGISTER_DECODER(MSS1, mss1); > > REGISTER_DECODER(MSS2, mss2); > > > > LGTM. > > Best regards, > Andreas Pushed. Thanks. --phil
diff --git a/libavcodec/allcodecs.c b/libavcodec/allcodecs.c index b592aa3..594d104 100644 --- a/libavcodec/allcodecs.c +++ b/libavcodec/allcodecs.c @@ -261,10 +261,10 @@ void avcodec_register_all(void) REGISTER_DECODER(MPEG2_CRYSTALHD, mpeg2_crystalhd); REGISTER_DECODER(MPEG2_QSV, mpeg2_qsv); REGISTER_DECODER(MSA1, msa1); - REGISTER_DECODER(MSMPEG4_CRYSTALHD, msmpeg4_crystalhd); REGISTER_DECODER(MSMPEG4V1, msmpeg4v1); REGISTER_ENCDEC (MSMPEG4V2, msmpeg4v2); REGISTER_ENCDEC (MSMPEG4V3, msmpeg4v3); + REGISTER_DECODER(MSMPEG4_CRYSTALHD, msmpeg4_crystalhd); REGISTER_DECODER(MSRLE, msrle); REGISTER_DECODER(MSS1, mss1); REGISTER_DECODER(MSS2, mss2);
This avoids it getting picked by default, which is generally undesirable and can break test runs. Signed-off-by: Philip Langdale <philipl@overt.org> --- libavcodec/allcodecs.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)