| Message ID | 20160806235130.13284-2-atomnuker@gmail.com |
|---|---|
| State | Accepted |
| Commit | fb0abb34cb5a510c9fae92bf62eaccffc8db303a |
| Headers | show |
"The ANMR coder requires -strict -2 and some may be removed in the future" should have "some" removed. On Sat, Aug 6, 2016 at 6:51 PM, Rostislav Pehlivanov <atomnuker@gmail.com> wrote: > This version has had much testing so there's little point in keeping it > maked as experimental. > > Signed-off-by: Rostislav Pehlivanov <atomnuker@gmail.com> > --- > libavcodec/aacenc.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/libavcodec/aacenc.c b/libavcodec/aacenc.c > index 2653cef..1d80a67 100644 > --- a/libavcodec/aacenc.c > +++ b/libavcodec/aacenc.c > @@ -999,9 +999,9 @@ static av_cold int aac_encode_init(AVCodecContext *avctx) > > /* Coder limitations */ > s->coder = &ff_aac_coders[s->options.coder]; > - if (s->options.coder != AAC_CODER_TWOLOOP) { > + if (s->options.coder == AAC_CODER_ANMR) { > ERROR_IF(avctx->strict_std_compliance > FF_COMPLIANCE_EXPERIMENTAL, > - "Coders other than twoloop require -strict -2 and some may be removed in the future\n"); > + "The ANMR coder requires -strict -2 and some may be removed in the future\n"); > s->options.intensity_stereo = 0; > s->options.pns = 0; > } > -- > 2.8.1.369.geae769a > > _______________________________________________ > ffmpeg-devel mailing list > ffmpeg-devel@ffmpeg.org > http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
On Sun, Aug 07, 2016 at 00:51:30 +0100, Rostislav Pehlivanov wrote: > This version has had much testing so there's little point in keeping it > maked as experimental. ^ marked Moritz
On Sun, Aug 07, 2016 at 01:10:55 -0500, Burt P. wrote: > "The ANMR coder requires -strict -2 and some may be removed in the future" > should have "some" removed. And I would probably quote the command line part of that, and use the symbolic value: "The ANMR coder requires \"-strict experimental\" and may be removed in the future" (What's the policy on suggesting command lines from within a library? Yes, I know it's done in quite a few places, just wondering.) Moritz
diff --git a/libavcodec/aacenc.c b/libavcodec/aacenc.c index 2653cef..1d80a67 100644 --- a/libavcodec/aacenc.c +++ b/libavcodec/aacenc.c @@ -999,9 +999,9 @@ static av_cold int aac_encode_init(AVCodecContext *avctx) /* Coder limitations */ s->coder = &ff_aac_coders[s->options.coder]; - if (s->options.coder != AAC_CODER_TWOLOOP) { + if (s->options.coder == AAC_CODER_ANMR) { ERROR_IF(avctx->strict_std_compliance > FF_COMPLIANCE_EXPERIMENTAL, - "Coders other than twoloop require -strict -2 and some may be removed in the future\n"); + "The ANMR coder requires -strict -2 and some may be removed in the future\n"); s->options.intensity_stereo = 0; s->options.pns = 0; }
This version has had much testing so there's little point in keeping it maked as experimental. Signed-off-by: Rostislav Pehlivanov <atomnuker@gmail.com> --- libavcodec/aacenc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)