diff options
| author | tack <tack@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2009-11-04 00:58:11 +0000 |
|---|---|---|
| committer | tack <tack@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2009-11-04 00:58:11 +0000 |
| commit | b6712cc6c214088be7abd3ed14b1897abc3054f2 (patch) | |
| tree | 9345c31c030c1240796140215222938a3dce2c26 /libaf | |
| parent | b88d08040e365295fe9bf4ff717fdb1d728fe87b (diff) | |
| download | mpv-b6712cc6c214088be7abd3ed14b1897abc3054f2.tar.bz2 mpv-b6712cc6c214088be7abd3ed14b1897abc3054f2.tar.xz | |
reorder_ch: Remove unneeded AF_CHANNEL_LAYOUT_LAVC_AAC_DEC_*
All references to these values were removed r29821.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29822 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libaf')
| -rw-r--r-- | libaf/reorder_ch.c | 2 | ||||
| -rw-r--r-- | libaf/reorder_ch.h | 5 |
2 files changed, 1 insertions, 6 deletions
diff --git a/libaf/reorder_ch.c b/libaf/reorder_ch.c index 13e11a4143..101aefc71d 100644 --- a/libaf/reorder_ch.c +++ b/libaf/reorder_ch.c @@ -1123,7 +1123,6 @@ static int channel_layout_mapping_5ch[AF_CHANNEL_LAYOUT_SOURCE_NUM] = { 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_CHANNEL_LAYOUT_SOURCE_NUM] = { 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, diff --git a/libaf/reorder_ch.h b/libaf/reorder_ch.h index cd32fa7808..44f1ad1fd5 100644 --- a/libaf/reorder_ch.h +++ b/libaf/reorder_ch.h @@ -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. |