[FFmpeg-cvslog] proresdec: support mixed interlaced/non-interlaced content

[Michael Smith]

ffmpeg | branch: master | Michael Smith <msmith at rdio.com> | Mon Jan 21 19:40:35 2013 +0100| [0881cbf314982cce8448bd12644ce2a6e0b8c576] | committer: Luca Barbato

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 at gentoo.org>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=0881cbf314982cce8448bd12644ce2a6e0b8c576
---

 libavcodec/proresdec.c |    2 ++
 1 file changed, 2 insertions(+)

diff --git a/libavcodec/proresdec.c b/libavcodec/proresdec.c
index f7e32c9..4b196f6 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];