diff options
| author |  Uoti Urpala <uau@symbol.nonexistent.invalid> | 2008-06-07 19:57:57 +0300 |
|---|---|---|
| committer | Uoti Urpala <uau@symbol.nonexistent.invalid> | 2008-06-07 19:57:57 +0300 |
| commit | af3fcdf2ded43e887bceed3a957b5cc4f7dbc2c6 (patch) | |
| tree | 2ead158ae6e6abfffcccf1609aa5492f9402e24f /libaf | |
| parent | d5c868325cefcd5fad53361d1dfdc9757674eb70 (diff) | |
| parent | 4653f5ed7575d6070b54a88b4deb449f838825b3 (diff) | |
Merge svn changes up to r27025
Conflicts:
command.c
libvo/vosub_vidix.c
libvo/vosub_vidix.h
mplayer.c
Diffstat (limited to 'libaf')
| -rw-r--r-- | libaf/reorder_ch.c | 4 | ||||
| -rw-r--r-- | libaf/reorder_ch.h | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/libaf/reorder_ch.c b/libaf/reorder_ch.c index 6fa6e727c3..4eb968842b 100644 --- a/libaf/reorder_ch.c +++ b/libaf/reorder_ch.c @@ -1108,7 +1108,7 @@ static int channel_layout_mapping_5ch[AF_CHANNEL_LAYOUT_SOURCE_NUM] = { 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 @@ static int channel_layout_mapping_6ch[AF_CHANNEL_LAYOUT_SOURCE_NUM] = { 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, diff --git a/libaf/reorder_ch.h b/libaf/reorder_ch.h index c5cc903e9b..f5ed1ea84b 100644 --- a/libaf/reorder_ch.h +++ b/libaf/reorder_ch.h @@ -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 @@ void reorder_channel(void *buf, #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 |