diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-05-03 12:58:52 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-05-03 13:03:00 +0200 |
| commit | 9fd5e75bdf62c5aa19163a6033b361dcc8e31238 (patch) | |
| tree | 78e6c625741181347876ccda1072f6d7bd85afec /libavcodec/vc1_parser.c | |
| parent | 6fc58a8cb6707087e31fa8396a9e73c6f7595638 (diff) | |
| parent | accde1bd8756936e1757b42fc9bad2eb5d192f8a (diff) | |
Merge commit 'accde1bd8756936e1757b42fc9bad2eb5d192f8a'
* commit 'accde1bd8756936e1757b42fc9bad2eb5d192f8a':
vc1_parser: Set field_order.
mpegvideo_parser: Set field_order.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/vc1_parser.c')
| -rw-r--r-- | libavcodec/vc1_parser.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/libavcodec/vc1_parser.c b/libavcodec/vc1_parser.c index 53af61c5da..9086cf41df 100644 --- a/libavcodec/vc1_parser.c +++ b/libavcodec/vc1_parser.c @@ -88,6 +88,11 @@ static void vc1_extract_headers(AVCodecParserContext *s, AVCodecContext *avctx, } } + if (vpc->v.broadcast && vpc->v.interlace && !vpc->v.psf) + s->field_order = vpc->v.tff ? AV_FIELD_TT : AV_FIELD_BB; + else + s->field_order = AV_FIELD_PROGRESSIVE; + break; } } |