aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Smith <msmith@rdio.com>2013-01-21 19:40:35 +0100
committerLuca Barbato <lu_zero@gentoo.org>2013-01-22 05:40:57 +0100
commit0881cbf314982cce8448bd12644ce2a6e0b8c576 (patch)
tree8dec7da6e67724f60268241a91b3a1d48204dd92
parent4a73fbd9c5d5ba6b32a116b296a8cb199f8940ed (diff)
downloadffmpeg-0881cbf314982cce8448bd12644ce2a6e0b8c576.tar.gz
proresdec: support mixed interlaced/non-interlaced content
Set interlaced to false if we don't have an interlaced frame Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
-rw-r--r--libavcodec/proresdec.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/libavcodec/proresdec.c b/libavcodec/proresdec.c
index f7e32c998b..4b196f6d32 100644
--- a/libavcodec/proresdec.c
+++ b/libavcodec/proresdec.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];