diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-01-18 01:14:01 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-01-18 16:25:36 +0100 |
| commit | e49780f749b2ce8e229fb8257cd01f60e0661b54 (patch) | |
| tree | b38420d6f5539410f87f23627cee944c68cc9e34 | |
| parent | 2fb65d3e55e4a667af42404a988d902e2acde50a (diff) | |
| download | ffmpeg-e49780f749b2ce8e229fb8257cd01f60e0661b54.tar.gz | |
lavc: call ff_init_buffer_info() from default reget buffer.
This is needed in case the get_buffer() callback doesnt set
width/height.
Ideally all decoders would make calls through some wraper
to the callbacks and that wraper would call ff_init_buffer_info()
But until thats done, the default reget buffer must call this
itself as it needs the values for the changed size check later.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavcodec/utils.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/libavcodec/utils.c b/libavcodec/utils.c index 1db3f617f9..0e3b595f61 100644 --- a/libavcodec/utils.c +++ b/libavcodec/utils.c @@ -608,6 +608,8 @@ int avcodec_default_reget_buffer(AVCodecContext *s, AVFrame *pic){ s->release_buffer(s, pic); } + ff_init_buffer_info(s, pic); + /* If no picture return a new buffer */ if(pic->data[0] == NULL) { /* We will copy from buffer, so must be readable */ @@ -617,9 +619,6 @@ int avcodec_default_reget_buffer(AVCodecContext *s, AVFrame *pic){ /* If internal buffer type return the same buffer */ if(pic->type == FF_BUFFER_TYPE_INTERNAL) { - if(s->pkt) pic->pkt_pts= s->pkt->pts; - else pic->pkt_pts= AV_NOPTS_VALUE; - pic->reordered_opaque= s->reordered_opaque; return 0; } |