Commit ce2f9fdb authored by foo86's avatar foo86 Committed by Michael Niedermayer

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: 's avatarMichael Niedermayer <michael@niedermayer.cc>
parent 9fcb59c9
......@@ -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;
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment