diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-09-01 20:51:31 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-09-01 20:51:44 +0200 |
| commit | f626eaa58e69532ff85044007b2ceb3ce8dd5ed2 (patch) | |
| tree | 46c9bb4e77048fc440a251c7b622de6af1410852 /libavcodec | |
| parent | 38c4316fff74ce51752ddb3722df619ecd2e8de6 (diff) | |
| parent | 63f800ca5f4f6b38f3789a7edb03bfabe8bacdd2 (diff) | |
| download | ffmpeg-f626eaa58e69532ff85044007b2ceb3ce8dd5ed2.tar.gz | |
Merge commit '63f800ca5f4f6b38f3789a7edb03bfabe8bacdd2'
* commit '63f800ca5f4f6b38f3789a7edb03bfabe8bacdd2':
aac_adtstoasc_bsf: Return proper error code
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/aac_adtstoasc_bsf.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/aac_adtstoasc_bsf.c b/libavcodec/aac_adtstoasc_bsf.c index 37ba5c17d2..b1515fdcd0 100644 --- a/libavcodec/aac_adtstoasc_bsf.c +++ b/libavcodec/aac_adtstoasc_bsf.c @@ -57,7 +57,7 @@ static int aac_adtstoasc_filter(AVBitStreamFilterContext *bsfc, if (avpriv_aac_parse_header(&gb, &hdr) < 0) { av_log(avctx, AV_LOG_ERROR, "Error parsing ADTS frame header!\n"); - return -1; + return AVERROR_INVALIDDATA; } if (!hdr.crc_absent && hdr.num_aac_frames > 1) { |