[FFmpeg-cvslog] libaacplus: return meaningful error codes

Paul B Mahol git at videolan.org
Thu May 23 21:59:00 CEST 2013


ffmpeg | branch: master | Paul B Mahol <onemda at gmail.com> | Thu May 23 19:40:15 2013 +0000| [abf1e59ef2f70f43043b37228553a19cbe6eb952] | committer: Paul B Mahol

libaacplus: return meaningful error codes

Signed-off-by: Paul B Mahol <onemda at gmail.com>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=abf1e59ef2f70f43043b37228553a19cbe6eb952
---

 libavcodec/libaacplus.c |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/libavcodec/libaacplus.c b/libavcodec/libaacplus.c
index 70cbe67..9c874fb 100644
--- a/libavcodec/libaacplus.c
+++ b/libavcodec/libaacplus.c
@@ -43,19 +43,19 @@ static av_cold int aacPlus_encode_init(AVCodecContext *avctx)
     /* number of channels */
     if (avctx->channels < 1 || avctx->channels > 2) {
         av_log(avctx, AV_LOG_ERROR, "encoding %d channel(s) is not allowed\n", avctx->channels);
-        return -1;
+        return AVERROR(EINVAL);
     }
 
     if (avctx->profile != FF_PROFILE_AAC_LOW && avctx->profile != FF_PROFILE_UNKNOWN) {
         av_log(avctx, AV_LOG_ERROR, "invalid AAC profile: %d, only LC supported\n", avctx->profile);
-        return -1;
+        return AVERROR(EINVAL);
     }
 
     s->aacplus_handle = aacplusEncOpen(avctx->sample_rate, avctx->channels,
                                        &s->samples_input, &s->max_output_bytes);
     if (!s->aacplus_handle) {
         av_log(avctx, AV_LOG_ERROR, "can't open encoder\n");
-        return -1;
+        return AVERROR(EINVAL);
     }
 
     /* check aacplus version */
@@ -67,7 +67,7 @@ static av_cold int aacPlus_encode_init(AVCodecContext *avctx)
     aacplus_cfg->inputFormat = avctx->sample_fmt == AV_SAMPLE_FMT_FLT ? AACPLUS_INPUT_FLOAT : AACPLUS_INPUT_16BIT;
     if (!aacplusEncSetConfiguration(s->aacplus_handle, aacplus_cfg)) {
         av_log(avctx, AV_LOG_ERROR, "libaacplus doesn't support this output format!\n");
-        return -1;
+        return AVERROR(EINVAL);
     }
 
     avctx->frame_size = s->samples_input / avctx->channels;



More information about the ffmpeg-cvslog mailing list