RepoMirrors
/
mpv
mirror of https://github.com/mpv-player/mpv
1
0
Fork 0
Code Issues Releases Wiki Activity

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
This commit is contained in:
tack 2009-11-04 00:58:11 +00:00
parent b88d08040e
commit b6712cc6c2
2 changed files with 1 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libaf/reorder_ch.c
View File

@ -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,

5
libaf/reorder_ch.h
View File

@ -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.