[FFmpeg-cvslog] Only ask once in the code for a TrueHD sample with strange channel layout.

Carl Eugen Hoyos git at videolan.org
Tue Apr 19 03:33:25 CEST 2011


ffmpeg | branch: master | Carl Eugen Hoyos <cehoyos at ag.or.at> | Tue Apr 19 03:23:46 2011 +0200| [9b53bb8b3bb89ec1a0f67c34d7c5e6cdcb558b48] | committer: Carl Eugen Hoyos

Only ask once in the code for a TrueHD sample with strange channel layout.

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

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

diff --git a/libavcodec/mlp_parser.c b/libavcodec/mlp_parser.c
index 834f9d4..3b87f43 100644
--- a/libavcodec/mlp_parser.c
+++ b/libavcodec/mlp_parser.c
@@ -326,10 +326,6 @@ static int mlp_parse(AVCodecParserContext *s,
                 avctx->channels = truehd_channels(mh.channels_thd_stream1);
                 avctx->channel_layout = ff_truehd_layout(mh.channels_thd_stream1);
             }
-            if (av_get_channel_layout_nb_channels(avctx->channel_layout) != avctx->channels) {
-                avctx->channel_layout = 0;
-                av_log_ask_for_sample(avctx, "Unknown channel layout.");
-            }
         }
 
         if (!mh.is_vbr) /* Stream is CBR */



More information about the ffmpeg-cvslog mailing list