[MPlayer-cvslog] r29822 - in trunk/libaf: reorder_ch.c reorder_ch.h

[tack]

Author: tack
Date: Wed Nov  4 01:58:11 2009
New Revision: 29822

Log:
reorder_ch: Remove unneeded AF_CHANNEL_LAYOUT_LAVC_AAC_DEC_*

All references to these values were removed r29821.

Modified:
   trunk/libaf/reorder_ch.c
   trunk/libaf/reorder_ch.h

Modified: trunk/libaf/reorder_ch.c
==============================================================================
--- trunk/libaf/reorder_ch.c	Wed Nov  4 01:54:46 2009	(r29821)
+++ trunk/libaf/reorder_ch.c	Wed Nov  4 01:58:11 2009	(r29822)
@@ -1123,7 +1123,6 @@ static int channel_layout_mapping_5ch[AF
     AF_CHANNEL_LAYOUT_WAVEEX_5CH_DEFAULT,
     AF_CHANNEL_LAYOUT_LAVC_5CH_DEFAULT,
     AF_CHANNEL_LAYOUT_VORBIS_5CH_DEFAULT,
-    AF_CHANNEL_LAYOUT_LAVC_AAC_DEC_5CH_DEFAULT,
 };
 
 static int channel_layout_mapping_6ch[AF_CHANNEL_LAYOUT_SOURCE_NUM] = {
@@ -1132,7 +1131,6 @@ static int channel_layout_mapping_6ch[AF
     AF_CHANNEL_LAYOUT_WAVEEX_6CH_DEFAULT,
     AF_CHANNEL_LAYOUT_LAVC_6CH_DEFAULT,
     AF_CHANNEL_LAYOUT_VORBIS_6CH_DEFAULT,
-    AF_CHANNEL_LAYOUT_LAVC_AAC_DEC_6CH_DEFAULT,
 };
 
 void reorder_channel_copy_nch(void *src,

Modified: trunk/libaf/reorder_ch.h
==============================================================================
--- trunk/libaf/reorder_ch.h	Wed Nov  4 01:54:46 2009	(r29821)
+++ trunk/libaf/reorder_ch.h	Wed Nov  4 01:58:11 2009	(r29822)
@@ -70,8 +70,6 @@
 #define AF_CHANNEL_LAYOUT_LAVC_6CH_DEFAULT AF_CHANNEL_LAYOUT_5_1_A
 #define AF_CHANNEL_LAYOUT_VORBIS_5CH_DEFAULT AF_CHANNEL_LAYOUT_5_0_C
 #define AF_CHANNEL_LAYOUT_VORBIS_6CH_DEFAULT AF_CHANNEL_LAYOUT_5_1_C
-#define AF_CHANNEL_LAYOUT_LAVC_AAC_DEC_5CH_DEFAULT AF_CHANNEL_LAYOUT_5_0_D
-#define AF_CHANNEL_LAYOUT_LAVC_AAC_DEC_6CH_DEFAULT AF_CHANNEL_LAYOUT_5_1_F
 
 #define AF_CHANNEL_MASK  0xFF
 #define AF_GET_CH_NUM(A) ((A)&0x7F)
@@ -102,8 +100,7 @@ void reorder_channel(void *buf,
 #define AF_CHANNEL_LAYOUT_WAVEEX_DEFAULT       2
 #define AF_CHANNEL_LAYOUT_LAVC_DEFAULT         3
 #define AF_CHANNEL_LAYOUT_VORBIS_DEFAULT       4
-#define AF_CHANNEL_LAYOUT_LAVC_AAC_DEC_DEFAULT 5
-#define AF_CHANNEL_LAYOUT_SOURCE_NUM           6
+#define AF_CHANNEL_LAYOUT_SOURCE_NUM           5
 #define AF_CHANNEL_LAYOUT_MPLAYER_DEFAULT AF_CHANNEL_LAYOUT_ALSA_DEFAULT
 
 /// Optimized channel reorder between different audio sources and targets.