diff options
| author | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2009-12-30 00:14:20 +0200 |
|---|---|---|
| committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2009-12-30 00:14:20 +0200 |
| commit | dc7f1830224e1953fb07ffcc045735b2b15af310 (patch) | |
| tree | 3028341d6fd07c19b8b7c78fdfd7c411cbdce573 /libmpdemux | |
| parent | 0f81e5f9732d143ab47c9b03dfd528f3a0af4aea (diff) | |
| parent | a0601ed2566d132fec57dcf163372f9f341f3c13 (diff) | |
| download | mpv-dc7f1830224e1953fb07ffcc045735b2b15af310.tar.bz2 mpv-dc7f1830224e1953fb07ffcc045735b2b15af310.tar.xz | |
Merge svn changes up to r30104
Ignore the broken correct-pts change in r30100.
Diffstat (limited to 'libmpdemux')
| -rw-r--r-- | libmpdemux/mp_taglists.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/libmpdemux/mp_taglists.c b/libmpdemux/mp_taglists.c index de3e3a707c..d40c17c34c 100644 --- a/libmpdemux/mp_taglists.c +++ b/libmpdemux/mp_taglists.c @@ -88,6 +88,7 @@ static const struct mp_AVCodecTag mp_bmp_tags[] = { { CODEC_ID_BETHSOFTVID, MKTAG('B', 'E', 'T', 'H')}, { CODEC_ID_BFI, MKTAG('B', 'F', 'I', 'V')}, { CODEC_ID_C93, MKTAG('C', '9', '3', 'V')}, + { CODEC_ID_CDGRAPHICS, MKTAG('C', 'D', 'G', 'R')}, { CODEC_ID_DNXHD, MKTAG('A', 'V', 'd', 'n')}, { CODEC_ID_DSICINVIDEO, MKTAG('D', 'C', 'I', 'V')}, { CODEC_ID_DXA, MKTAG('D', 'X', 'A', '1')}, |