diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-05-22 20:12:51 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-05-22 20:24:41 +0200 |
| commit | d9b264bc73723ce538d72f28a4a8fb4f85af7eca (patch) | |
| tree | 7a2f93dbd9adf87534c29c932ed157941a2c4af6 /libavcodec/h263dec.c | |
| parent | 337aa17e61091500b95d6127c9ffd65d9086decb (diff) | |
| parent | 848e86f74d3e6e87fa592ee8ba8c184cc5fd9a42 (diff) | |
| download | ffmpeg-d9b264bc73723ce538d72f28a4a8fb4f85af7eca.tar.gz | |
Merge commit '848e86f74d3e6e87fa592ee8ba8c184cc5fd9a42'
* commit '848e86f74d3e6e87fa592ee8ba8c184cc5fd9a42':
mpegvideo: Drop flags and flags2
Conflicts:
libavcodec/mpeg12dec.c
libavcodec/mpeg12enc.c
libavcodec/mpegvideo.c
libavcodec/mpegvideo_enc.c
libavcodec/mpegvideo_motion.c
libavcodec/ratecontrol.c
libavcodec/vc1_block.c
libavcodec/vc1_loopfilter.c
libavcodec/vc1_mc.c
libavcodec/vc1dec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/h263dec.c')
| -rw-r--r-- | libavcodec/h263dec.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/libavcodec/h263dec.c b/libavcodec/h263dec.c index 3e115eb60c..7faf12009b 100644 --- a/libavcodec/h263dec.c +++ b/libavcodec/h263dec.c @@ -163,7 +163,7 @@ static int get_consumed_bytes(MpegEncContext *s, int buf_size) /* We would have to scan through the whole buf to handle the weird * reordering ... */ return buf_size; - } else if (s->flags & CODEC_FLAG_TRUNCATED) { + } else if (s->avctx->flags & CODEC_FLAG_TRUNCATED) { pos -= s->parse_context.last_index; // padding is not really read so this might be -1 if (pos < 0) @@ -414,9 +414,6 @@ int ff_h263_decode_frame(AVCodecContext *avctx, void *data, int *got_frame, int slice_ret = 0; AVFrame *pict = data; - s->flags = avctx->flags; - s->flags2 = avctx->flags2; - /* no supplementary picture */ if (buf_size == 0) { /* special case for last picture */ @@ -431,7 +428,7 @@ int ff_h263_decode_frame(AVCodecContext *avctx, void *data, int *got_frame, return 0; } - if (s->flags & CODEC_FLAG_TRUNCATED) { + if (s->avctx->flags & CODEC_FLAG_TRUNCATED) { int next; if (CONFIG_MPEG4_DECODER && s->codec_id == AV_CODEC_ID_MPEG4) { |