aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCarl Eugen Hoyos <cehoyos@ag.or.at>2011-04-14 01:28:14 +0200
committerCarl Eugen Hoyos <cehoyos@ag.or.at>2011-04-14 03:33:10 +0200
commit19de9d5646ad9f1a5f5951d0c15353014808aea4 (patch)
tree2458f10bbcd16120baffb1c6ea7b430ef61f095e
parent460acdf059906da5d378a3414bb9053b401e484d (diff)
downloadffmpeg-19de9d5646ad9f1a5f5951d0c15353014808aea4.tar.gz
Cosmetics: Fix indentation and move one line.
-rw-r--r--libavdevice/alsa-audio-common.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/libavdevice/alsa-audio-common.c b/libavdevice/alsa-audio-common.c
index ce27bcc074..a158e8efc0 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 ?