diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-10-28 12:34:35 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-10-28 12:34:35 +0100 |
| commit | 84f972f9944ad29712c70f22bd55b2b12171abf8 (patch) | |
| tree | 0a7b495dc78053710fbfff6ab6b4e36b5c483321 /libavcodec/wavpack.c | |
| parent | 528f5cdd2cf1c54f3f1b983964993c698ff91aca (diff) | |
| parent | 23a211cbba0b7c9ee694040031b2e5da1be54a00 (diff) | |
| download | ffmpeg-84f972f9944ad29712c70f22bd55b2b12171abf8.tar.gz | |
Merge commit '23a211cbba0b7c9ee694040031b2e5da1be54a00'
* commit '23a211cbba0b7c9ee694040031b2e5da1be54a00':
lavc: change all decoders to behave consistently with AV_EF_CRCCHECK.
Conflicts:
libavcodec/avcodec.h
libavcodec/tta.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/wavpack.c')
| -rw-r--r-- | libavcodec/wavpack.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/libavcodec/wavpack.c b/libavcodec/wavpack.c index 203cd28f6d..94a4cb4d6a 100644 --- a/libavcodec/wavpack.c +++ b/libavcodec/wavpack.c @@ -548,9 +548,11 @@ static inline int wv_unpack_mono(WavpackFrameContext *s, GetBitContext *gb, } while (!last && count < s->samples); wv_reset_saved_context(s); - if ((s->avctx->err_recognition & AV_EF_CRCCHECK) && - wv_check_crc(s, crc, crc_extra_bits)) - return AVERROR_INVALIDDATA; + if (s->avctx->err_recognition & AV_EF_CRCCHECK) { + int ret = wv_check_crc(s, crc, crc_extra_bits); + if (ret < 0 && s->avctx->err_recognition & AV_EF_EXPLODE) + return ret; + } return 0; } |