diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-01-22 17:54:06 +0400 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-01-22 18:33:23 +0400 |
| commit | 26345acb0e723d28aa28e09126ea383b2f679f5b (patch) | |
| tree | f8d7a9f62d7557aca5ad56dd244fa415fdab56f2 /libavcodec/proresdec_lgpl.c | |
| parent | 9774251c45eadfe0ba7b0381344451fa8840cc0d (diff) | |
| parent | 0881cbf314982cce8448bd12644ce2a6e0b8c576 (diff) | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
proresdec: support mixed interlaced/non-interlaced content
vp3/5: move put_no_rnd_pixels_l2 from dsputil to VP3DSPContext.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/proresdec_lgpl.c')
| -rw-r--r-- | libavcodec/proresdec_lgpl.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/libavcodec/proresdec_lgpl.c b/libavcodec/proresdec_lgpl.c index 4fa2817e86..a25ecca3c9 100644 --- a/libavcodec/proresdec_lgpl.c +++ b/libavcodec/proresdec_lgpl.c @@ -164,6 +164,8 @@ static int decode_frame_header(ProresContext *ctx, const uint8_t *buf, if (ctx->frame_type) { /* if interlaced */ ctx->picture.interlaced_frame = 1; ctx->picture.top_field_first = ctx->frame_type & 1; + } else { + ctx->picture.interlaced_frame = 0; } avctx->color_primaries = buf[14]; |