From 4941dfb4f6de5f4a9fbb31b6fc07829bd58a5269 Mon Sep 17 00:00:00 2001
From: Michael Smith <msmith@rdio.com>
Date: Mon, 21 Jan 2013 19:40:35 +0100
Subject: [PATCH] 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>
(cherry picked from commit 0881cbf314982cce8448bd12644ce2a6e0b8c576)

Signed-off-by: Reinhard Tartler <siretart@tauware.de>
(cherry picked from commit 1fa37f2bfa0f5c50ce61dedf2bbb772d96d71101)

Signed-off-by: Reinhard Tartler <siretart@tauware.de>
---
 libavcodec/proresdec.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/libavcodec/proresdec.c b/libavcodec/proresdec.c
index 031760c3b..bc99665a8 100644
--- a/libavcodec/proresdec.c
+++ b/libavcodec/proresdec.c
@@ -186,6 +186,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;
     }
 
     ctx->alpha_info = buf[17] & 0xf;
-- 
2.34.1