ffmpeg | branch: master | Michael Niedermayer <mich...@niedermayer.cc> | Fri Sep 4 00:33:49 2015 +0200| [a3ad51e0d5b3ff6634c1be6322ce82c17105e82b] | committer: Michael Niedermayer
avfilter/af_amerge: avoid undefined shift (<<64) in outlayout setup Fixes CID1322306 Reviewed-by: Ganesh Ajjanagadde <gajja...@mit.edu> Signed-off-by: Michael Niedermayer <mich...@niedermayer.cc> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=a3ad51e0d5b3ff6634c1be6322ce82c17105e82b --- libavfilter/af_amerge.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavfilter/af_amerge.c b/libavfilter/af_amerge.c index 9c3cfed..410d613 100644 --- a/libavfilter/af_amerge.c +++ b/libavfilter/af_amerge.c @@ -110,8 +110,8 @@ static int query_formats(AVFilterContext *ctx) for (i = 0; i < nb_ch; i++) s->route[i] = i; outlayout = av_get_default_channel_layout(nb_ch); - if (!outlayout) - outlayout = ((int64_t)1 << nb_ch) - 1; + if (!outlayout && nb_ch) + outlayout = 0xFFFFFFFFFFFFFFFFULL >> (64 - nb_ch); } else { int *route[SWR_CH_MAX]; int c, out_ch_number = 0; _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
