From: foo86 <foobaz86@gmail.com>
Date: Mon, 2 May 2016 20:44:47 +0000 (+0300)
Subject: avcodec/dca: fix sync word search error condition
X-Git-Tag: android-x86-7.1-r1~5409
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=ce2f9fdb0a92956aedfa2c564d1374a2f1eebfbd;p=android-x86%2Fexternal-ffmpeg.git

avcodec/dca: fix sync word search error condition

This didn't actually check if sync word was found and always errored out
with "-err_detect explode" option enabled.

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
---

diff --git a/libavcodec/dca_core.c b/libavcodec/dca_core.c
index fc4fdf4386..58c78f7c76 100644
--- a/libavcodec/dca_core.c
+++ b/libavcodec/dca_core.c
@@ -1844,9 +1844,10 @@ static int parse_optional_info(DCACoreDecoder *s)
                 }
             }
 
-            if (s->avctx->err_recognition & AV_EF_EXPLODE) {
+            if (!s->xch_pos) {
                 av_log(s->avctx, AV_LOG_ERROR, "XCH sync word not found\n");
-                return AVERROR_INVALIDDATA;
+                if (s->avctx->err_recognition & AV_EF_EXPLODE)
+                    return AVERROR_INVALIDDATA;
             }
             break;
 
@@ -1866,9 +1867,10 @@ static int parse_optional_info(DCACoreDecoder *s)
                 }
             }
 
-            if (s->avctx->err_recognition & AV_EF_EXPLODE) {
+            if (!s->x96_pos) {
                 av_log(s->avctx, AV_LOG_ERROR, "X96 sync word not found\n");
-                return AVERROR_INVALIDDATA;
+                if (s->avctx->err_recognition & AV_EF_EXPLODE)
+                    return AVERROR_INVALIDDATA;
             }
             break;
 
@@ -1891,9 +1893,10 @@ static int parse_optional_info(DCACoreDecoder *s)
                 }
             }
 
-            if (s->avctx->err_recognition & AV_EF_EXPLODE) {
+            if (!s->xxch_pos) {
                 av_log(s->avctx, AV_LOG_ERROR, "XXCH sync word not found\n");
-                return AVERROR_INVALIDDATA;
+                if (s->avctx->err_recognition & AV_EF_EXPLODE)
+                    return AVERROR_INVALIDDATA;
             }
             break;
         }