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/tta.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/tta.c')
| -rw-r--r-- | libavcodec/tta.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libavcodec/tta.c b/libavcodec/tta.c index 6ba3235392..b917881d65 100644 --- a/libavcodec/tta.c +++ b/libavcodec/tta.c @@ -251,7 +251,8 @@ static int tta_decode_frame(AVCodecContext *avctx, void *data, int32_t *p; if (avctx->err_recognition & AV_EF_CRCCHECK) { - if (buf_size < 4 || tta_check_crc(s, buf, buf_size - 4)) + if (buf_size < 4 || + (tta_check_crc(s, buf, buf_size - 4) && avctx->err_recognition & AV_EF_EXPLODE)) return AVERROR_INVALIDDATA; } |