[FFmpeg-cvslog] update_frame_pool: use channel field

Michael Niedermayer git at videolan.org
Tue Mar 12 03:30:59 CET 2013


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Mar 11 17:18:46 2013 +0100| [9dd0b7ad821ae1b60acd9ac8f6384c03bd28be51] | committer: Michael Niedermayer

update_frame_pool: use channel field

Fix memory corruption

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

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

 libavcodec/utils.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libavcodec/utils.c b/libavcodec/utils.c
index d68c280..9085dfe 100644
--- a/libavcodec/utils.c
+++ b/libavcodec/utils.c
@@ -420,7 +420,7 @@ static int update_frame_pool(AVCodecContext *avctx, AVFrame *frame)
         break;
         }
     case AVMEDIA_TYPE_AUDIO: {
-        int ch     = av_get_channel_layout_nb_channels(frame->channel_layout);
+        int ch     = av_frame_get_channels(frame); //av_get_channel_layout_nb_channels(frame->channel_layout);
         int planar = av_sample_fmt_is_planar(frame->format);
         int planes = planar ? ch : 1;
 



More information about the ffmpeg-cvslog mailing list