Index: libaf/reorder_ch.c
===================================================================
--- libaf/reorder_ch.c	(revision 26994)
+++ libaf/reorder_ch.c	(working copy)
@@ -1108,7 +1108,7 @@
     AF_CHANNEL_LAYOUT_LAVC_AC3_5CH_DEFAULT,
     AF_CHANNEL_LAYOUT_LAVC_LIBA52_5CH_DEFAULT,
     AF_CHANNEL_LAYOUT_LAVC_DCA_5CH_DEFAULT,
-    AF_CHANNEL_LAYOUT_LAVC_VORBIS_5CH_DEFAULT,
+    AF_CHANNEL_LAYOUT_VORBIS_5CH_DEFAULT,
 };
 
 static int channel_layout_mapping_6ch[AF_CHANNEL_LAYOUT_SOURCE_NUM] = {
@@ -1118,7 +1118,7 @@
     AF_CHANNEL_LAYOUT_LAVC_AC3_6CH_DEFAULT,
     AF_CHANNEL_LAYOUT_LAVC_LIBA52_6CH_DEFAULT,
     AF_CHANNEL_LAYOUT_LAVC_DCA_6CH_DEFAULT,
-    AF_CHANNEL_LAYOUT_LAVC_VORBIS_6CH_DEFAULT,
+    AF_CHANNEL_LAYOUT_VORBIS_6CH_DEFAULT,
 };
 
 void reorder_channel_copy_nch(void *src,
Index: libaf/reorder_ch.h
===================================================================
--- libaf/reorder_ch.h	(revision 26994)
+++ libaf/reorder_ch.h	(working copy)
@@ -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
 
Index: libmpcodecs/ad_ffmpeg.c
===================================================================
--- libmpcodecs/ad_ffmpeg.c	(revision 26994)
+++ libmpcodecs/ad_ffmpeg.c	(working copy)
@@ -176,7 +176,7 @@
             else if (!strcasecmp(codec, "liba52"))
               src_ch_layout = AF_CHANNEL_LAYOUT_LAVC_LIBA52_DEFAULT;
             else if (!strcasecmp(codec, "vorbis"))
-              src_ch_layout = AF_CHANNEL_LAYOUT_LAVC_VORBIS_DEFAULT;
+              src_ch_layout = AF_CHANNEL_LAYOUT_VORBIS_DEFAULT;
             else
               src_ch_layout = AF_CHANNEL_LAYOUT_MPLAYER_DEFAULT;
             reorder_channel_nch(buf, src_ch_layout,