diff options
| author | Nidhi Makhijani <nidhimj22@gmail.com> | 2014-08-15 17:07:24 +0530 |
|---|---|---|
| committer | Diego Biurrun <diego@biurrun.de> | 2014-08-21 04:25:48 -0700 |
| commit | 13c90bc9a359e969cc2b7f7e8199b02a0e4c6ec9 (patch) | |
| tree | cc13feebacca94bd35c1a16f2cd804c058d37b8e /libavformat/adtsenc.c | |
| parent | 593aaee953f8b07c141ff115e67bae85ef0350c7 (diff) | |
| download | ffmpeg-13c90bc9a359e969cc2b7f7e8199b02a0e4c6ec9.tar.gz | |
adts: Return more meaningful error codes
Signed-off-by: Diego Biurrun <diego@biurrun.de>
Diffstat (limited to 'libavformat/adtsenc.c')
| -rw-r--r-- | libavformat/adtsenc.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/libavformat/adtsenc.c b/libavformat/adtsenc.c index bf7a62ae70..5194e75a5f 100644 --- a/libavformat/adtsenc.c +++ b/libavformat/adtsenc.c @@ -57,23 +57,23 @@ static int adts_decode_extradata(AVFormatContext *s, ADTSContext *adts, uint8_t if (adts->objecttype > 3U) { av_log(s, AV_LOG_ERROR, "MPEG-4 AOT %d is not allowed in ADTS\n", adts->objecttype+1); - return -1; + return AVERROR_INVALIDDATA; } if (adts->sample_rate_index == 15) { av_log(s, AV_LOG_ERROR, "Escape sample rate index illegal in ADTS\n"); - return -1; + return AVERROR_INVALIDDATA; } if (get_bits(&gb, 1)) { av_log(s, AV_LOG_ERROR, "960/120 MDCT window is not allowed in ADTS\n"); - return -1; + return AVERROR_INVALIDDATA; } if (get_bits(&gb, 1)) { av_log(s, AV_LOG_ERROR, "Scalable configurations are not allowed in ADTS\n"); - return -1; + return AVERROR_INVALIDDATA; } if (get_bits(&gb, 1)) { av_log(s, AV_LOG_ERROR, "Extension flag is not allowed in ADTS\n"); - return -1; + return AVERROR_INVALIDDATA; } if (!adts->channel_conf) { init_put_bits(&pb, adts->pce_data, MAX_PCE_SIZE); @@ -93,9 +93,9 @@ static int adts_write_header(AVFormatContext *s) ADTSContext *adts = s->priv_data; AVCodecContext *avc = s->streams[0]->codec; - if (avc->extradata_size > 0 && - adts_decode_extradata(s, adts, avc->extradata, avc->extradata_size) < 0) - return -1; + if (avc->extradata_size > 0) + return adts_decode_extradata(s, adts, avc->extradata, + avc->extradata_size); return 0; } |