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/alsdec.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/alsdec.c')
| -rw-r--r-- | libavcodec/alsdec.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/libavcodec/alsdec.c b/libavcodec/alsdec.c index 7b99d8689e..825949f6a7 100644 --- a/libavcodec/alsdec.c +++ b/libavcodec/alsdec.c @@ -1565,6 +1565,8 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *got_frame_ptr, if (ctx->cur_frame_length != sconf->frame_length && ctx->crc_org != ctx->crc) { av_log(avctx, AV_LOG_ERROR, "CRC error.\n"); + if (avctx->err_recognition & AV_EF_EXPLODE) + return AVERROR_INVALIDDATA; } } |