[FFmpeg-cvslog] Add forgotten line to silence a warning for int32.

Carl Eugen Hoyos git at videolan.org
Thu Apr 14 05:10:33 CEST 2011


ffmpeg | branch: master | Carl Eugen Hoyos <cehoyos at ag.or.at> | Thu Apr 14 01:14:19 2011 +0200| [e2049edb4e6663c658d888ae0cf3632607333e12] | committer: Carl Eugen Hoyos

Add forgotten line to silence a warning for int32.

AV_CH_LAYOUT_QUAD is the only (multi-) channel layout that has the
same channel ordering for FFmpeg and alsa.

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

 libavdevice/alsa-audio-common.c |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/libavdevice/alsa-audio-common.c b/libavdevice/alsa-audio-common.c
index a6f3899..0e5b997 100644
--- a/libavdevice/alsa-audio-common.c
+++ b/libavdevice/alsa-audio-common.c
@@ -141,6 +141,7 @@ static av_cold ff_reorder_func find_reorder_func(int codec_id,
             NULL :
     codec_id == CODEC_ID_PCM_U32LE || codec_id == CODEC_ID_PCM_U32BE ||
     codec_id == CODEC_ID_PCM_S32LE || codec_id == CODEC_ID_PCM_S32BE ?
+        layout == AV_CH_LAYOUT_QUAD ? REORDER_DUMMY :
         layout == AV_CH_LAYOUT_5POINT0_BACK || layout == AV_CH_LAYOUT_5POINT0 ?
             out ? alsa_reorder_int32_out_50 : NULL :
         layout == AV_CH_LAYOUT_5POINT1_BACK || layout == AV_CH_LAYOUT_5POINT1 ?



More information about the ffmpeg-cvslog mailing list