diff options
| author | Martin Storsjö <martin@martin.st> | 2011-04-13 00:10:56 +0300 |
|---|---|---|
| committer | Martin Storsjö <martin@martin.st> | 2011-04-13 11:30:38 +0300 |
| commit | 900a129f4f16d4bd19a7707b51eb711382a6e42d (patch) | |
| tree | de25d2f9ca21966be1206461ed7b1cfdb097fcfe /libavcodec | |
| parent | a8ec07c933450eea929f632ee867383ebd55532a (diff) | |
| download | ffmpeg-900a129f4f16d4bd19a7707b51eb711382a6e42d.tar.gz | |
libopencore-amr, libvo-amrwbenc: Return proper error codes in most places
Signed-off-by: Martin Storsjö <martin@martin.st>
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/libopencore-amr.c | 16 | ||||
| -rw-r--r-- | libavcodec/libvo-amrwbenc.c | 8 |
2 files changed, 12 insertions, 12 deletions
diff --git a/libavcodec/libopencore-amr.c b/libavcodec/libopencore-amr.c index fa72a221cf..a81d272a1c 100644 --- a/libavcodec/libopencore-amr.c +++ b/libavcodec/libopencore-amr.c @@ -92,7 +92,7 @@ static av_cold int amr_nb_decode_init(AVCodecContext *avctx) if (avctx->channels > 1) { av_log(avctx, AV_LOG_ERROR, "amr_nb: multichannel decoding not supported\n"); - return -1; + return AVERROR(ENOSYS); } return 0; @@ -126,7 +126,7 @@ static int amr_nb_decode_frame(AVCodecContext *avctx, void *data, if (packet_size > buf_size) { av_log(avctx, AV_LOG_ERROR, "amr frame too short (%u, should be %u)\n", buf_size, packet_size); - return -1; + return AVERROR_INVALIDDATA; } s->frameCount++; @@ -159,12 +159,12 @@ static av_cold int amr_nb_encode_init(AVCodecContext *avctx) if (avctx->sample_rate != 8000) { av_log(avctx, AV_LOG_ERROR, "Only 8000Hz sample rate supported\n"); - return -1; + return AVERROR(ENOSYS); } if (avctx->channels != 1) { av_log(avctx, AV_LOG_ERROR, "Only mono supported\n"); - return -1; + return AVERROR(ENOSYS); } avctx->frame_size = 160; @@ -178,7 +178,7 @@ static av_cold int amr_nb_encode_init(AVCodecContext *avctx) if ((s->enc_bitrate = getBitrateMode(avctx->bit_rate)) < 0) { av_log(avctx, AV_LOG_ERROR, nb_bitrate_unsupported); - return -1; + return AVERROR(ENOSYS); } return 0; @@ -202,7 +202,7 @@ static int amr_nb_encode_frame(AVCodecContext *avctx, if ((s->enc_bitrate = getBitrateMode(avctx->bit_rate)) < 0) { av_log(avctx, AV_LOG_ERROR, nb_bitrate_unsupported); - return -1; + return AVERROR(ENOSYS); } written = Encoder_Interface_Encode(s->enstate, s->enc_bitrate, data, @@ -250,7 +250,7 @@ static av_cold int amr_wb_decode_init(AVCodecContext *avctx) if (avctx->channels > 1) { av_log(avctx, AV_LOG_ERROR, "amr_wb: multichannel decoding not supported\n"); - return -1; + return AVERROR(ENOSYS); } return 0; @@ -277,7 +277,7 @@ static int amr_wb_decode_frame(AVCodecContext *avctx, void *data, if (packet_size > buf_size) { av_log(avctx, AV_LOG_ERROR, "amr frame too short (%u, should be %u)\n", buf_size, packet_size + 1); - return -1; + return AVERROR_INVALIDDATA; } s->frameCount++; diff --git a/libavcodec/libvo-amrwbenc.c b/libavcodec/libvo-amrwbenc.c index 661a15d445..a5e8f397c9 100644 --- a/libavcodec/libvo-amrwbenc.c +++ b/libavcodec/libvo-amrwbenc.c @@ -65,17 +65,17 @@ static av_cold int amr_wb_encode_init(AVCodecContext *avctx) if (avctx->sample_rate != 16000) { av_log(avctx, AV_LOG_ERROR, "Only 16000Hz sample rate supported\n"); - return -1; + return AVERROR(ENOSYS); } if (avctx->channels != 1) { av_log(avctx, AV_LOG_ERROR, "Only mono supported\n"); - return -1; + return AVERROR(ENOSYS); } if ((s->mode = getWBBitrateMode(avctx->bit_rate)) < 0) { av_log(avctx, AV_LOG_ERROR, wb_bitrate_unsupported); - return -1; + return AVERROR(ENOSYS); } avctx->frame_size = 320; @@ -105,7 +105,7 @@ static int amr_wb_encode_frame(AVCodecContext *avctx, if ((s->mode = getWBBitrateMode(avctx->bit_rate)) < 0) { av_log(avctx, AV_LOG_ERROR, wb_bitrate_unsupported); - return -1; + return AVERROR(ENOSYS); } size = E_IF_encode(s->state, s->mode, data, frame, s->allow_dtx); return size; |