ffmpeg | branch: release/3.0 | foo86 <fooba...@gmail.com> | Mon May 2 23:44:47 2016 +0300| [08c21bcb5dfd609167327a7900be6292fd0e51c1] | committer: James Almer
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 <mich...@niedermayer.cc> (cherry picked from commit ce2f9fdb0a92956aedfa2c564d1374a2f1eebfbd) > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=08c21bcb5dfd609167327a7900be6292fd0e51c1 --- libavcodec/dca_core.c | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/libavcodec/dca_core.c b/libavcodec/dca_core.c index d9f1a4c..19496e9 100644 --- a/libavcodec/dca_core.c +++ b/libavcodec/dca_core.c @@ -1900,9 +1900,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; @@ -1922,9 +1923,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; @@ -1947,9 +1949,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; } _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
