diff options
| author | Justin Ruggles <justin.ruggles@gmail.com> | 2011-10-28 13:10:27 -0400 |
|---|---|---|
| committer | Justin Ruggles <justin.ruggles@gmail.com> | 2011-10-29 15:06:31 -0400 |
| commit | f20dd574f1a9933abe5e9405908bcf2c4111cc25 (patch) | |
| tree | a162e066bae66b3793e689ed81026cc5ad94890a /libavcodec/atrac1.c | |
| parent | 6dc7dd7af45aa1e341b471fd054f85ae2747775b (diff) | |
| download | ffmpeg-f20dd574f1a9933abe5e9405908bcf2c4111cc25.tar.gz | |
atrac1: return appropriate error codes instead of -1
Diffstat (limited to 'libavcodec/atrac1.c')
| -rw-r--r-- | libavcodec/atrac1.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/libavcodec/atrac1.c b/libavcodec/atrac1.c index 3f42deaa7e..ef5156c650 100644 --- a/libavcodec/atrac1.c +++ b/libavcodec/atrac1.c @@ -131,7 +131,7 @@ static int at1_imdct_block(AT1SUCtx* su, AT1Ctx *q) nbits = mdct_long_nbits[band_num] - log2_block_count; if (nbits != 5 && nbits != 7 && nbits != 8) - return -1; + return AVERROR_INVALIDDATA; } else { block_size = 32; nbits = 5; @@ -175,14 +175,14 @@ static int at1_parse_bsm(GetBitContext* gb, int log2_block_cnt[AT1_QMF_BANDS]) /* low and mid band */ log2_block_count_tmp = get_bits(gb, 2); if (log2_block_count_tmp & 1) - return -1; + return AVERROR_INVALIDDATA; log2_block_cnt[i] = 2 - log2_block_count_tmp; } /* high band */ log2_block_count_tmp = get_bits(gb, 2); if (log2_block_count_tmp != 0 && log2_block_count_tmp != 3) - return -1; + return AVERROR_INVALIDDATA; log2_block_cnt[IDX_HIGH_BAND] = 3 - log2_block_count_tmp; skip_bits(gb, 2); @@ -231,7 +231,7 @@ static int at1_unpack_dequant(GetBitContext* gb, AT1SUCtx* su, /* check for bitstream overflow */ if (bits_used > AT1_SU_MAX_BITS) - return -1; + return AVERROR_INVALIDDATA; /* get the position of the 1st spec according to the block size mode */ pos = su->log2_block_count[band_num] ? bfu_start_short[bfu_num] : bfu_start_long[bfu_num]; @@ -285,7 +285,7 @@ static int atrac1_decode_frame(AVCodecContext *avctx, void *data, if (buf_size < 212 * q->channels) { av_log(q,AV_LOG_ERROR,"Not enough data to decode!\n"); - return -1; + return AVERROR_INVALIDDATA; } out_size = q->channels * AT1_SU_SAMPLES * |