[FFmpeg-cvslog] avcodec/rdft: Use more specific error codes

Michael Niedermayer git at videolan.org
Fri Jun 5 04:17:42 CEST 2015


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Jun  5 04:05:57 2015 +0200| [c93602ae5bd4a3d3e51c86e0778b85631fe41b67] | committer: Michael Niedermayer

avcodec/rdft: Use more specific error codes

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

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

 libavcodec/rdft.c |    7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/libavcodec/rdft.c b/libavcodec/rdft.c
index e85219e..c318aa8 100644
--- a/libavcodec/rdft.c
+++ b/libavcodec/rdft.c
@@ -99,16 +99,17 @@ static void rdft_calc_c(RDFTContext *s, FFTSample *data)
 av_cold int ff_rdft_init(RDFTContext *s, int nbits, enum RDFTransformType trans)
 {
     int n = 1 << nbits;
+    int ret;
 
     s->nbits           = nbits;
     s->inverse         = trans == IDFT_C2R || trans == DFT_C2R;
     s->sign_convention = trans == IDFT_R2C || trans == DFT_C2R ? 1 : -1;
 
     if (nbits < 4 || nbits > 16)
-        return -1;
+        return AVERROR(EINVAL);
 
-    if (ff_fft_init(&s->fft, nbits-1, trans == IDFT_C2R || trans == IDFT_R2C) < 0)
-        return -1;
+    if ((ret = ff_fft_init(&s->fft, nbits-1, trans == IDFT_C2R || trans == IDFT_R2C)) < 0)
+        return ret;
 
     ff_init_ff_cos_tabs(nbits);
     s->tcos = ff_cos_tabs[nbits];



More information about the ffmpeg-cvslog mailing list