[FFmpeg-cvslog] Cosmetics: Fix indentation and move one line.

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:28:14 2011 +0200| [19de9d5646ad9f1a5f5951d0c15353014808aea4] | committer: Carl Eugen Hoyos

Cosmetics: Fix indentation and move one line.

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

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

diff --git a/libavdevice/alsa-audio-common.c b/libavdevice/alsa-audio-common.c
index ce27bcc..a158e8e 100644
--- a/libavdevice/alsa-audio-common.c
+++ b/libavdevice/alsa-audio-common.c
@@ -134,9 +134,9 @@ static av_cold ff_reorder_func find_reorder_func(int codec_id,
     return
     codec_id == CODEC_ID_PCM_U16LE || codec_id == CODEC_ID_PCM_U16BE ||
     codec_id == CODEC_ID_PCM_S16LE || codec_id == CODEC_ID_PCM_S16BE ?
+        layout == AV_CH_LAYOUT_QUAD ? REORDER_DUMMY :
         layout == AV_CH_LAYOUT_5POINT0_BACK || layout == AV_CH_LAYOUT_5POINT0 ?
             out ? alsa_reorder_int16_out_50 : NULL :
-        layout == AV_CH_LAYOUT_QUAD ? REORDER_DUMMY :
         layout == AV_CH_LAYOUT_5POINT1_BACK || layout == AV_CH_LAYOUT_5POINT1 ?
             out ? alsa_reorder_int16_out_51 : NULL :
         layout == AV_CH_LAYOUT_7POINT1 ?
@@ -151,7 +151,7 @@ static av_cold ff_reorder_func find_reorder_func(int codec_id,
             out ? alsa_reorder_int32_out_51 : NULL :
         layout == AV_CH_LAYOUT_7POINT1 ?
             out ? alsa_reorder_int32_out_71 : NULL :
-           NULL :
+            NULL :
     codec_id == CODEC_ID_PCM_F32LE || codec_id == CODEC_ID_PCM_F32BE ?
         layout == AV_CH_LAYOUT_QUAD ? REORDER_DUMMY :
         layout == AV_CH_LAYOUT_5POINT0_BACK || layout == AV_CH_LAYOUT_5POINT0 ?



More information about the ffmpeg-cvslog mailing list