[FFmpeg-cvslog] avfilter/af_compand: silence "maybe uninitialized" warnings
Michael Niedermayer
git at videolan.org
Sat Sep 7 04:05:32 CEST 2013
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sat Sep 7 03:07:34 2013 +0200| [64c54f8333dd829ed57a032b93a3cb1323cd0fc4] | committer: Michael Niedermayer
avfilter/af_compand: silence "maybe uninitialized" warnings
if channels is 0 it actually would be uninitialized, thus an assert with comment is added
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=64c54f8333dd829ed57a032b93a3cb1323cd0fc4
---
libavfilter/af_compand.c | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/libavfilter/af_compand.c b/libavfilter/af_compand.c
index 6cbfbf4..fda09bb 100644
--- a/libavfilter/af_compand.c
+++ b/libavfilter/af_compand.c
@@ -22,6 +22,7 @@
*
*/
+#include "libavutil/avassert.h"
#include "libavutil/avstring.h"
#include "libavutil/opt.h"
#include "libavutil/samplefmt.h"
@@ -214,9 +215,11 @@ static int compand_delay(AVFilterContext *ctx, AVFrame *frame)
AVFilterLink *inlink = ctx->inputs[0];
const int channels = inlink->channels;
const int nb_samples = frame->nb_samples;
- int chan, i, dindex, oindex, count;
+ int chan, i, av_uninit(dindex), oindex, av_uninit(count);
AVFrame *out_frame = NULL;
+ av_assert1(channels > 0); /* would corrupt delay_count and delay_index */
+
for (chan = 0; chan < channels; chan++) {
const double *src = (double *)frame->data[chan];
double *dbuf = (double *)s->delayptrs[chan];
More information about the ffmpeg-cvslog
mailing list