virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-24 13:56:33 +02:00
Code Issues Releases Activity

libspeexdec: return meaningful error codes

Browse Source
This commit is contained in:
Justin Ruggles 2011-10-21 12:13:04 -04:00
parent 14bc60dbae
commit a470fe80ba
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libavcodec/libspeexdec.c
View File

@ -60,14 +60,14 @@ static av_cold int libspeex_decode_init(AVCodecContext *avctx)
mode = speex_lib_get_mode(s->header->mode); mode = speex_lib_get_mode(s->header->mode);
if (!mode) { if (!mode) {
av_log(avctx, AV_LOG_ERROR, "Unknown Speex mode %d", s->header->mode); av_log(avctx, AV_LOG_ERROR, "Unknown Speex mode %d", s->header->mode);
return -1; return AVERROR_INVALIDDATA;
} }
} else } else
av_log(avctx, AV_LOG_INFO, "Missing Speex header, assuming defaults.\n"); av_log(avctx, AV_LOG_INFO, "Missing Speex header, assuming defaults.\n");
if (avctx->channels > 2) { if (avctx->channels > 2) {
av_log(avctx, AV_LOG_ERROR, "Only stereo and mono are supported.\n"); av_log(avctx, AV_LOG_ERROR, "Only stereo and mono are supported.\n");
return -1; return AVERROR(EINVAL);
} }
speex_bits_init(&s->bits); speex_bits_init(&s->bits);
@ -128,7 +128,7 @@ static int libspeex_decode_frame(AVCodecContext *avctx,
ret = speex_decode_int(s->dec_state, &s->bits, output); ret = speex_decode_int(s->dec_state, &s->bits, output);
if (ret <= -2) { if (ret <= -2) {
av_log(avctx, AV_LOG_ERROR, "Error decoding Speex frame.\n"); av_log(avctx, AV_LOG_ERROR, "Error decoding Speex frame.\n");
return -1; return AVERROR_INVALIDDATA;
} }
if (avctx->channels == 2) if (avctx->channels == 2)
speex_decode_stereo_int(output, s->frame_size, &s->stereo); speex_decode_stereo_int(output, s->frame_size, &s->stereo);