Mercurial > mplayer.hg

comparison libmpdemux/mp_taglists.c @ 34404:95f802285711

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Allow compilation with Libav Some CPP Macros and codec ids are not (yet) available in libav, so use them only if they are actually defined. This doesn't work for code ids, as they are defined as enums. Therefore, #ifdefs tests for the presence of the respective codec. This approach should also allow to compile mplayer against earlier versions of FFmpeg.
author siretart
date Tue, 03 Jan 2012 15:51:26 +0000
parents 995cbc4b5884
children fb9948833d0c
comparison
equal deleted inserted replaced
34403:bca629bb50cf 34404:95f802285711
41 { CODEC_ID_BINKAUDIO_RDFT, MKTAG('B', 'A', 'U', '2')}, 41 { CODEC_ID_BINKAUDIO_RDFT, MKTAG('B', 'A', 'U', '2')},
42 { CODEC_ID_BMV_AUDIO, MKTAG('B', 'M', 'V', 'A')}, 42 { CODEC_ID_BMV_AUDIO, MKTAG('B', 'M', 'V', 'A')},
43 { CODEC_ID_COOK, MKTAG('c', 'o', 'o', 'k')}, 43 { CODEC_ID_COOK, MKTAG('c', 'o', 'o', 'k')},
44 { CODEC_ID_DSICINAUDIO, MKTAG('D', 'C', 'I', 'A')}, 44 { CODEC_ID_DSICINAUDIO, MKTAG('D', 'C', 'I', 'A')},
45 { CODEC_ID_EAC3, MKTAG('E', 'A', 'C', '3')}, 45 { CODEC_ID_EAC3, MKTAG('E', 'A', 'C', '3')},
46 #ifdef CONFIG_FFWAVESYNTH_DECODER
46 { CODEC_ID_FFWAVESYNTH, MKTAG('F', 'F', 'W', 'S')}, 47 { CODEC_ID_FFWAVESYNTH, MKTAG('F', 'F', 'W', 'S')},
48 #endif
47 { CODEC_ID_G723_1, MKTAG('7', '2', '3', '1')}, 49 { CODEC_ID_G723_1, MKTAG('7', '2', '3', '1')},
48 { CODEC_ID_INTERPLAY_DPCM, MKTAG('I', 'N', 'P', 'A')}, 50 { CODEC_ID_INTERPLAY_DPCM, MKTAG('I', 'N', 'P', 'A')},
49 { CODEC_ID_MLP, MKTAG('M', 'L', 'P', ' ')}, 51 { CODEC_ID_MLP, MKTAG('M', 'L', 'P', ' ')},
50 { CODEC_ID_MP1, 0x50}, 52 { CODEC_ID_MP1, 0x50},
51 { CODEC_ID_MP4ALS, MKTAG('A', 'L', 'S', ' ')}, 53 { CODEC_ID_MP4ALS, MKTAG('A', 'L', 'S', ' ')},
83 { CODEC_ID_ADPCM_IMA_AMV, MKTAG('A', 'M', 'V', 'A')}, 85 { CODEC_ID_ADPCM_IMA_AMV, MKTAG('A', 'M', 'V', 'A')},
84 { CODEC_ID_DTS, 0x2001}, 86 { CODEC_ID_DTS, 0x2001},
85 { CODEC_ID_DVVIDEO, MKTAG('d', 'v', 's', 'd')}, 87 { CODEC_ID_DVVIDEO, MKTAG('d', 'v', 's', 'd')},
86 { CODEC_ID_EAC3, MKTAG('E', 'A', 'C', '3')}, 88 { CODEC_ID_EAC3, MKTAG('E', 'A', 'C', '3')},
87 { CODEC_ID_ESCAPE124, MKTAG('E', '1', '2', '4')}, 89 { CODEC_ID_ESCAPE124, MKTAG('E', '1', '2', '4')},
90 #ifdef CONFIG_ESCAPE130_DECODER
88 { CODEC_ID_ESCAPE130, MKTAG('E', '1', '3', '0')}, 91 { CODEC_ID_ESCAPE130, MKTAG('E', '1', '3', '0')},
92 #endif
89 { CODEC_ID_FLV1, MKTAG('F', 'L', 'V', '1')}, 93 { CODEC_ID_FLV1, MKTAG('F', 'L', 'V', '1')},
90 { CODEC_ID_G729, MKTAG('G', '7', '2', '9')}, 94 { CODEC_ID_G729, MKTAG('G', '7', '2', '9')},
91 { CODEC_ID_H264, MKTAG('H', '2', '6', '4')}, 95 { CODEC_ID_H264, MKTAG('H', '2', '6', '4')},
92 { CODEC_ID_MP3, 0x55}, 96 { CODEC_ID_MP3, 0x55},
93 { CODEC_ID_MPEG4, MKTAG('M', 'P', '4', 'V')}, 97 { CODEC_ID_MPEG4, MKTAG('M', 'P', '4', 'V')},