diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-08-03 00:45:02 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-08-03 00:45:08 +0200 |
| commit | bdccfc3fc354632f49721fc435310fb958843b21 (patch) | |
| tree | 620c1d613984edfbf1b6e873633290a43dbd7586 /libavcodec | |
| parent | 154c8bf60b65654ba28e47e5b38f70e1f1e5d90c (diff) | |
| parent | ae4c912bcecb5048611c4491a818d489ec828f59 (diff) | |
| download | ffmpeg-bdccfc3fc354632f49721fc435310fb958843b21.tar.gz | |
Merge remote-tracking branch 'cehoyos/master'
* cehoyos/master:
Forward interlaced field information from mov to ffv1 decoder.
Do not suggest to use gas-preprocessor if using it would break compilation.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/ffv1dec.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/libavcodec/ffv1dec.c b/libavcodec/ffv1dec.c index 17b894645f..2fe511ebd8 100644 --- a/libavcodec/ffv1dec.c +++ b/libavcodec/ffv1dec.c @@ -784,6 +784,13 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *got_frame, AVPac f->cur = p = f->picture.f; + if (f->version < 3 && avctx->field_order > AV_FIELD_PROGRESSIVE) { + /* we have interlaced material flagged in container */ + p->interlaced_frame = 1; + if (avctx->field_order == AV_FIELD_TT || avctx->field_order == AV_FIELD_TB) + p->top_field_first = 1; + } + f->avctx = avctx; ff_init_range_decoder(c, buf, buf_size); ff_build_rac_states(c, 0.05 * (1LL << 32), 256 - 8); |