diff options
Diffstat (limited to 'libmpdemux/mp_taglists.c')
| -rw-r--r-- | libmpdemux/mp_taglists.c | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/libmpdemux/mp_taglists.c b/libmpdemux/mp_taglists.c index 2fff42e1e0..7fc68db5f9 100644 --- a/libmpdemux/mp_taglists.c +++ b/libmpdemux/mp_taglists.c @@ -18,11 +18,14 @@ #include "config.h" -#include "mp_taglists.h" #include "libavformat/avformat.h" -#include "libavformat/riff.h" +#include <libavcodec/avcodec.h> + +#include "mp_taglists.h" + +#include "ffmpeg_files/taglists.c" -static const AVCodecTag mp_wav_tags[] = { +static const struct mp_AVCodecTag mp_wav_tags[] = { { CODEC_ID_ADPCM_4XM, MKTAG('4', 'X', 'M', 'A')}, { CODEC_ID_ADPCM_ADX, MKTAG('S', 'a', 'd', 'x')}, { CODEC_ID_ADPCM_EA, MKTAG('A', 'D', 'E', 'A')}, @@ -58,9 +61,9 @@ static const AVCodecTag mp_wav_tags[] = { { 0, 0 }, }; -const struct AVCodecTag * const mp_wav_taglists[] = {ff_codec_wav_tags, mp_wav_tags, 0}; +const struct mp_AVCodecTag * const mp_wav_taglists[] = {mp_ff_codec_wav_tags, mp_wav_tags, 0}; -static const AVCodecTag mp_codecid_override_tags[] = { +static const struct mp_AVCodecTag mp_codecid_override_tags[] = { { CODEC_ID_AAC, MKTAG('M', 'P', '4', 'A')}, { CODEC_ID_AC3, 0x2000}, { CODEC_ID_ADPCM_IMA_AMV, MKTAG('A', 'M', 'V', 'A')}, @@ -83,10 +86,9 @@ static const AVCodecTag mp_codecid_override_tags[] = { { 0, 0 }, }; -const struct AVCodecTag * const mp_codecid_override_taglists[] = - {mp_codecid_override_tags, 0}; +const struct mp_AVCodecTag * const mp_codecid_override_taglists[] = {mp_codecid_override_tags, 0}; -static const AVCodecTag mp_bmp_tags[] = { +static const struct mp_AVCodecTag mp_bmp_tags[] = { { CODEC_ID_AMV, MKTAG('A', 'M', 'V', 'V')}, { CODEC_ID_BETHSOFTVID, MKTAG('B', 'E', 'T', 'H')}, { CODEC_ID_BFI, MKTAG('B', 'F', 'I', 'V')}, @@ -118,4 +120,4 @@ static const AVCodecTag mp_bmp_tags[] = { { 0, 0 }, }; -const struct AVCodecTag * const mp_bmp_taglists[] = {ff_codec_bmp_tags, mp_bmp_tags, 0}; +const struct mp_AVCodecTag * const mp_bmp_taglists[] = {mp_ff_codec_bmp_tags, mp_bmp_tags, 0}; |