[FFmpeg-cvslog] ffplay: fix invalid wanted_channel_layout calculation

Marton Balint git at videolan.org
Thu Jan 5 20:41:34 CET 2012


ffmpeg | branch: master | Marton Balint <cus at passwd.hu> | Wed Jan  4 22:50:09 2012 +0100| [8ee77fc8d4034924c4151304e274bf65809aec39] | committer: Marton Balint

ffplay: fix invalid wanted_channel_layout calculation

Signed-off-by: Marton Balint <cus at passwd.hu>

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

 ffplay.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/ffplay.c b/ffplay.c
index 46426e7..1a1b3f7 100644
--- a/ffplay.c
+++ b/ffplay.c
@@ -2263,7 +2263,7 @@ static int stream_component_open(VideoState *is, int stream_index)
         if (env)
             wanted_channel_layout = av_get_default_channel_layout(SDL_atoi(env));
         if (!wanted_channel_layout) {
-            wanted_channel_layout = (avctx->channel_layout && avctx->channels == av_get_channel_layout_nb_channels(avctx->channels)) ? avctx->channel_layout : av_get_default_channel_layout(avctx->channels);
+            wanted_channel_layout = (avctx->channel_layout && avctx->channels == av_get_channel_layout_nb_channels(avctx->channel_layout)) ? avctx->channel_layout : av_get_default_channel_layout(avctx->channels);
             wanted_channel_layout &= ~AV_CH_LAYOUT_STEREO_DOWNMIX;
             wanted_nb_channels = av_get_channel_layout_nb_channels(wanted_channel_layout);
             /* SDL only supports 1, 2, 4 or 6 channels at the moment, so we have to make sure not to request anything else. */



More information about the ffmpeg-cvslog mailing list