summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorUoti Urpala <uau@glyph.nonexistent.invalid>2011-02-05 03:38:50 +0200
committerUoti Urpala <uau@glyph.nonexistent.invalid>2011-02-05 03:38:50 +0200
commitcba6d60bcd2e51dfd9a42007c0421e7635e78a9c (patch)
treee054989f35c0ba5652c1938f59a89344075bba99
parent1f1ef44dd15f1e45d13489f96886cfd5f0c57aa3 (diff)
downloadmpv-cba6d60bcd2e51dfd9a42007c0421e7635e78a9c.tar.bz2
mpv-cba6d60bcd2e51dfd9a42007c0421e7635e78a9c.tar.xz
ffmpeg_files/taglists.c: add new FFmpeg values
Updated to last FFmpeg svn version values (r26400).
-rw-r--r--ffmpeg_files/taglists.c10
1 files changed, 10 insertions, 0 deletions
diff --git a/ffmpeg_files/taglists.c b/ffmpeg_files/taglists.c
index 5d262ccb48..1596110907 100644
--- a/ffmpeg_files/taglists.c
+++ b/ffmpeg_files/taglists.c
@@ -163,6 +163,7 @@ const struct mp_AVCodecTag mp_ff_codec_bmp_tags[] = {
{ CODEC_ID_RAWVIDEO, MKTAG('u', 'y', 'v', '1') },
{ CODEC_ID_RAWVIDEO, MKTAG('2', 'V', 'u', '1') },
{ CODEC_ID_RAWVIDEO, MKTAG('2', 'v', 'u', 'y') },
+ { CODEC_ID_RAWVIDEO, MKTAG('y', 'u', 'v', 's') },
{ CODEC_ID_RAWVIDEO, MKTAG('P', '4', '2', '2') },
{ CODEC_ID_RAWVIDEO, MKTAG('Y', 'V', '1', '2') },
{ CODEC_ID_RAWVIDEO, MKTAG('U', 'Y', 'V', 'Y') },
@@ -259,6 +260,9 @@ const struct mp_AVCodecTag mp_ff_codec_bmp_tags[] = {
{ CODEC_ID_AURA2, MKTAG('A', 'U', 'R', '2') },
{ CODEC_ID_DPX, MKTAG('d', 'p', 'x', ' ') },
{ CODEC_ID_KGV1, MKTAG('K', 'G', 'V', '1') },
+#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(52, 108, 0)
+ { CODEC_ID_LAGARITH, MKTAG('L', 'A', 'G', 'S') },
+#endif
{ CODEC_ID_NONE, 0 }
};
@@ -295,9 +299,15 @@ const struct mp_AVCodecTag mp_ff_codec_wav_tags[] = {
{ CODEC_ID_WMALOSSLESS, 0x0163 },
{ CODEC_ID_ADPCM_CT, 0x0200 },
{ CODEC_ID_ATRAC3, 0x0270 },
+#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(52, 88, 0)
+ { CODEC_ID_ADPCM_G722, 0x028F },
+#endif
{ CODEC_ID_IMC, 0x0401 },
{ CODEC_ID_GSM_MS, 0x1500 },
{ CODEC_ID_TRUESPEECH, 0x1501 },
+#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(52, 94, 0)
+ { CODEC_ID_AAC_LATM, 0x1602 },
+#endif
{ CODEC_ID_AC3, 0x2000 },
{ CODEC_ID_DTS, 0x2001 },
{ CODEC_ID_SONIC, 0x2048 },