[FFmpeg-cvslog] utils: Dont sent fake channel layouts, 0 layout is better when its not known

Michael Niedermayer git at videolan.org
Tue Mar 12 12:55:47 CET 2013


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Mar 12 12:42:27 2013 +0100| [a303dce28c9b3e7d532334907dd6cdca8fd6042c] | committer: Michael Niedermayer

utils: Dont sent fake channel layouts, 0 layout is better when its not known

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

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

 libavcodec/utils.c |    2 --
 1 file changed, 2 deletions(-)

diff --git a/libavcodec/utils.c b/libavcodec/utils.c
index 5b53bee..bc1fc0c 100644
--- a/libavcodec/utils.c
+++ b/libavcodec/utils.c
@@ -646,8 +646,6 @@ int ff_init_buffer_info(AVCodecContext *avctx, AVFrame *frame)
                 }
 
                 frame->channel_layout = av_get_default_channel_layout(avctx->channels);
-                if (!frame->channel_layout)
-                    frame->channel_layout = (1ULL << avctx->channels) - 1;
             }
         }
         av_frame_set_channels(frame, avctx->channels);



More information about the ffmpeg-cvslog mailing list