[FFmpeg-cvslog] avcodec/utils: dont depend on the channel layout in unrefcount_frame()

Michael Niedermayer git at videolan.org
Tue Dec 10 01:18:57 CET 2013


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Dec 10 00:33:15 2013 +0100| [999ee28124f3b636bfab7cc6cb77b13224e07583] | committer: Michael Niedermayer

avcodec/utils: dont depend on the channel layout in unrefcount_frame()

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

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

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

diff --git a/libavcodec/utils.c b/libavcodec/utils.c
index eeefcf2..ee873d7 100644
--- a/libavcodec/utils.c
+++ b/libavcodec/utils.c
@@ -2047,7 +2047,7 @@ static int unrefcount_frame(AVCodecInternal *avci, AVFrame *frame)
     memcpy(frame->data,     avci->to_free->data,     sizeof(frame->data));
     memcpy(frame->linesize, avci->to_free->linesize, sizeof(frame->linesize));
     if (avci->to_free->extended_data != avci->to_free->data) {
-        int planes = av_get_channel_layout_nb_channels(avci->to_free->channel_layout);
+        int planes = av_frame_get_channels(avci->to_free);
         int size   = planes * sizeof(*frame->extended_data);
 
         if (!size) {



More information about the ffmpeg-cvslog mailing list