aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2013-07-12 14:13:04 +0200
committerMichael Niedermayer <michaelni@gmx.at>2013-07-12 14:13:22 +0200
commit107a56c1ed8c95ea668a073fb865c4dac19ffd38 (patch)
tree064636a7576ecfef3cdb797cdf6253001c4a303e
parent73f940e4d94c8f7bc8713af6e092d1d580de81fd (diff)
parentf261e508459e28beca59868a878e1519a44bb678 (diff)
downloadffmpeg-107a56c1ed8c95ea668a073fb865c4dac19ffd38.tar.gz
Merge commit 'f261e508459e28beca59868a878e1519a44bb678'
* commit 'f261e508459e28beca59868a878e1519a44bb678': dca: Error out on missing DSYNC Merged-by: Michael Niedermayer <michaelni@gmx.at>
-rw-r--r--libavcodec/dcadec.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/libavcodec/dcadec.c b/libavcodec/dcadec.c
index aa583742f5..d1612e2d3a 100644
--- a/libavcodec/dcadec.c
+++ b/libavcodec/dcadec.c
@@ -1422,6 +1422,7 @@ static int dca_subsubframe(DCAContext *s, int base_channel, int block_index)
#endif
} else {
av_log(s->avctx, AV_LOG_ERROR, "Didn't get subframe DSYNC\n");
+ return AVERROR_INVALIDDATA;
}
}