diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2013-12-06 06:55:12 +0400 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2013-12-06 06:55:12 +0400 |
commit | dfd11eb2a5404d2b59073ebb8433f25c51ca084b (patch) | |
tree | ba28970fa92e3acbfc20b0b8b005270e2bacd4e4 /libavcodec/vc1dec.c | |
parent | 52b69fa142cb445c191852a9f9d9dcddf80e95e4 (diff) | |
parent | ac1fc92ea410c396594fcd79f5d4491fe6a8cc90 (diff) |
Merge commit 'ac1fc92ea410c396594fcd79f5d4491fe6a8cc90'
* commit 'ac1fc92ea410c396594fcd79f5d4491fe6a8cc90':
vc1dec: move setting repeat_pict after frame_start() has been called.
Conflicts:
libavcodec/vc1dec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/vc1dec.c')
-rw-r--r-- | libavcodec/vc1dec.c | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/libavcodec/vc1dec.c b/libavcodec/vc1dec.c index d6756594bc..e44fe2dea3 100644 --- a/libavcodec/vc1dec.c +++ b/libavcodec/vc1dec.c @@ -6005,18 +6005,6 @@ static int vc1_decode_frame(AVCodecContext *avctx, void *data, goto err; } - // process pulldown flags - s->current_picture_ptr->f.repeat_pict = 0; - // Pulldown flags are only valid when 'broadcast' has been set. - // So ticks_per_frame will be 2 - if (v->rff) { - // repeat field - s->current_picture_ptr->f.repeat_pict = 1; - } else if (v->rptfrm) { - // repeat frames - s->current_picture_ptr->f.repeat_pict = v->rptfrm * 2; - } - // for skipping the frame s->current_picture.f.pict_type = s->pict_type; s->current_picture.f.key_frame = s->pict_type == AV_PICTURE_TYPE_I; @@ -6045,6 +6033,18 @@ static int vc1_decode_frame(AVCodecContext *avctx, void *data, v->s.current_picture_ptr->f.interlaced_frame = (v->fcm != PROGRESSIVE); v->s.current_picture_ptr->f.top_field_first = v->tff; + // process pulldown flags + s->current_picture_ptr->f.repeat_pict = 0; + // Pulldown flags are only valid when 'broadcast' has been set. + // So ticks_per_frame will be 2 + if (v->rff) { + // repeat field + s->current_picture_ptr->f.repeat_pict = 1; + } else if (v->rptfrm) { + // repeat frames + s->current_picture_ptr->f.repeat_pict = v->rptfrm * 2; + } + s->me.qpel_put = s->dsp.put_qpel_pixels_tab; s->me.qpel_avg = s->dsp.avg_qpel_pixels_tab; |