[FFmpeg-cvslog] ac3enc: remove check for mismatching channels and channel_layout

Justin Ruggles git at videolan.org
Thu Apr 28 04:28:31 CEST 2011


ffmpeg | branch: master | Justin Ruggles <justin.ruggles at gmail.com> | Tue Apr 19 19:06:52 2011 -0400| [8745e9c45865a4409272d78db1e1af86a8b955e9] | committer: Justin Ruggles

ac3enc: remove check for mismatching channels and channel_layout

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=8745e9c45865a4409272d78db1e1af86a8b955e9
---

 libavcodec/ac3enc.c |    2 --
 1 files changed, 0 insertions(+), 2 deletions(-)

diff --git a/libavcodec/ac3enc.c b/libavcodec/ac3enc.c
index 77647d4..1f3c92a 100644
--- a/libavcodec/ac3enc.c
+++ b/libavcodec/ac3enc.c
@@ -1988,8 +1988,6 @@ static av_cold int set_channel_info(AC3EncodeContext *s, int channels,
     ch_layout = *channel_layout;
     if (!ch_layout)
         ch_layout = avcodec_guess_channel_layout(channels, CODEC_ID_AC3, NULL);
-    if (av_get_channel_layout_nb_channels(ch_layout) != channels)
-        return AVERROR(EINVAL);
 
     s->lfe_on       = !!(ch_layout & AV_CH_LOW_FREQUENCY);
     s->channels     = channels;



More information about the ffmpeg-cvslog mailing list