summaryrefslogtreecommitdiff
path: root/libavcodec
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2011-11-08 15:24:58 +0100
committerMichael Niedermayer <michaelni@gmx.at>2011-11-08 15:31:10 +0100
commit33feba3abfe64c3b020f5738ea06a951b5906655 (patch)
treef39fcfe49378ef813be2877664e3e0a9deab8c8c /libavcodec
parent4d7c71c36467331f1e0c0f17af9f371d33308a9c (diff)
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.
Diffstat (limited to 'libavcodec')
-rw-r--r--libavcodec/utils.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/libavcodec/utils.c b/libavcodec/utils.c
index bd9babc073..9c0269b749 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);