diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2013-12-06 07:09:47 +0400 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2013-12-06 07:09:47 +0400 |
commit | 0d9f2f5c47a008d3077510e499d68a4e960e2c66 (patch) | |
tree | 259a63de479dfccd0e5f777e043d73aebec16aab /libavcodec/vc1dec.c | |
parent | 28eacd135162e34379b5c0146ad41a3601f35cd8 (diff) | |
parent | 66499f34b56fc6a9fdef25543bd9d576fc787895 (diff) |
Merge commit '66499f34b56fc6a9fdef25543bd9d576fc787895'
* commit '66499f34b56fc6a9fdef25543bd9d576fc787895':
mpegvideo: do not set current_picture_ptr in decoders
Conflicts:
libavcodec/mss2.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/vc1dec.c')
-rw-r--r-- | libavcodec/vc1dec.c | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/libavcodec/vc1dec.c b/libavcodec/vc1dec.c index e44fe2dea3..87846449ec 100644 --- a/libavcodec/vc1dec.c +++ b/libavcodec/vc1dec.c @@ -5968,15 +5968,6 @@ static int vc1_decode_frame(AVCodecContext *avctx, void *data, } } - /* We need to set current_picture_ptr before reading the header, - * otherwise we cannot store anything in there. */ - if (s->current_picture_ptr == NULL || s->current_picture_ptr->f.data[0]) { - int i = ff_find_unused_picture(s, 0); - if (i < 0) - goto err; - s->current_picture_ptr = &s->picture[i]; - } - // do parse frame header v->pic_header_flag = 0; v->first_pic_header_flag = 1; |