aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2011-05-13 23:23:30 +0200
committerMichael Niedermayer <michaelni@gmx.at>2011-05-14 00:16:49 +0200
commita3bc7a9ebf37e642878f6a50a234feb987e732e9 (patch)
tree343b2ff5950fd1c41edbd8e7fe4cd426c1ddb5c0
parent2bd12ee3c8dd7b2555af9aafa0b484b32ba59520 (diff)
downloadffmpeg-a3bc7a9ebf37e642878f6a50a234feb987e732e9.tar.gz
avcodec_default_get_buffer: init picture parameters.
Fixes multithreading regression introduced in 64c06615d2b99fb9f4ffd6226d0e5787b44a41e2 Fixes ticket197 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
-rw-r--r--libavcodec/utils.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/libavcodec/utils.c b/libavcodec/utils.c
index 86a1b4957a..6ec8addfb1 100644
--- a/libavcodec/utils.c
+++ b/libavcodec/utils.c
@@ -351,6 +351,10 @@ int avcodec_default_get_buffer(AVCodecContext *s, AVFrame *pic){
pic->pkt_pos = -1;
}
pic->reordered_opaque= s->reordered_opaque;
+ pic->sample_aspect_ratio = s->sample_aspect_ratio;
+ pic->width = s->width;
+ pic->height = s->height;
+ pic->format = s->pix_fmt;
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);