[FFmpeg-cvslog] Revert "lavc: Init AVFrame->opaque to AVCodecContext. opaque in avcodec_default_get_buffer()"

Michael Niedermayer git at videolan.org
Tue Nov 8 15:33:47 CET 2011


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Nov  8 15:24:58 2011 +0100| [33feba3abfe64c3b020f5738ea06a951b5906655] | committer: Michael Niedermayer

Revert "lavc: Init AVFrame->opaque to AVCodecContext.opaque in avcodec_default_get_buffer()"
This commit causes problems for vlc, see https://trac.videolan.org/vlc/ticket/5518

This reverts commit 475fb67d0b391ad1e8e3e8e3d65d7e6892e17e7a.

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

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

diff --git a/libavcodec/utils.c b/libavcodec/utils.c
index bd9babc..9c0269b 100644
--- a/libavcodec/utils.c
+++ b/libavcodec/utils.c
@@ -397,7 +397,6 @@ int avcodec_default_get_buffer(AVCodecContext *s, AVFrame *pic){
     pic->width               = s->width;
     pic->height              = s->height;
     pic->format              = s->pix_fmt;
-    pic->opaque              = s->opaque;
 
     if(s->debug&FF_DEBUG_BUFFERS)
         av_log(s, AV_LOG_DEBUG, "default_get_buffer called on pic %p, %d buffers used\n", pic, s->internal_buffer_count);



More information about the ffmpeg-cvslog mailing list