Mercurial > mplayer.hg

diff libaf/reorder_ch.h @ 26987:d3a0f537dbe8

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
rename AF_CHANNEL_LAYOUT_LAVC_VORBIS* => AF_CHANNEL_LAYOUT_VORBIS*.
author ulion
date Sat, 07 Jun 2008 12:57:36 +0000
parents b3a38b361fef
children e65738d7dd3b
line wrap: on
line diff
--- a/libaf/reorder_ch.h	Sat Jun 07 12:57:23 2008 +0000
+++ b/libaf/reorder_ch.h	Sat Jun 07 12:57:36 2008 +0000
@@ -71,8 +71,8 @@
 #define AF_CHANNEL_LAYOUT_LAVC_LIBA52_6CH_DEFAULT AF_CHANNEL_LAYOUT_5_1_E
 #define AF_CHANNEL_LAYOUT_LAVC_DCA_5CH_DEFAULT AF_CHANNEL_LAYOUT_5_0_D
 #define AF_CHANNEL_LAYOUT_LAVC_DCA_6CH_DEFAULT AF_CHANNEL_LAYOUT_5_1_D
-#define AF_CHANNEL_LAYOUT_LAVC_VORBIS_5CH_DEFAULT AF_CHANNEL_LAYOUT_5_0_C
-#define AF_CHANNEL_LAYOUT_LAVC_VORBIS_6CH_DEFAULT AF_CHANNEL_LAYOUT_5_1_C
+#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_MASK  0xFF
 #define AF_GET_CH_NUM(A) ((A)&0x7F)
@@ -104,7 +104,7 @@
 #define AF_CHANNEL_LAYOUT_LAVC_AC3_DEFAULT    3
 #define AF_CHANNEL_LAYOUT_LAVC_LIBA52_DEFAULT 4
 #define AF_CHANNEL_LAYOUT_LAVC_DCA_DEFAULT    5
-#define AF_CHANNEL_LAYOUT_LAVC_VORBIS_DEFAULT 6
+#define AF_CHANNEL_LAYOUT_VORBIS_DEFAULT      6
 #define AF_CHANNEL_LAYOUT_SOURCE_NUM          7
 #define AF_CHANNEL_LAYOUT_MPLAYER_DEFAULT AF_CHANNEL_LAYOUT_ALSA_DEFAULT