diff options
| author | Hendrik Leppkes <h.leppkes@gmail.com> | 2015-09-07 16:07:07 +0200 |
|---|---|---|
| committer | Hendrik Leppkes <h.leppkes@gmail.com> | 2015-09-07 16:07:07 +0200 |
| commit | d02d208211eb9a9de2e082942d007d558b2ce110 (patch) | |
| tree | 04aa6c6fcc585e23e022e3916eb0d62cb916408c /libavformat/isom.c | |
| parent | aea611dc3e9e8e40c43b2b89f1af957c383cb0f3 (diff) | |
| parent | c45fcf30cfab687004ed1cdc06ebaa21f4262a0b (diff) | |
| download | ffmpeg-d02d208211eb9a9de2e082942d007d558b2ce110.tar.gz | |
Merge commit 'c45fcf30cfab687004ed1cdc06ebaa21f4262a0b'
* commit 'c45fcf30cfab687004ed1cdc06ebaa21f4262a0b':
DXV decoder
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
Diffstat (limited to 'libavformat/isom.c')
| -rw-r--r-- | libavformat/isom.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/libavformat/isom.c b/libavformat/isom.c index 463033d6dc..eff04ff8a2 100644 --- a/libavformat/isom.c +++ b/libavformat/isom.c @@ -262,6 +262,9 @@ const AVCodecTag ff_codec_movvideo_tags[] = { { AV_CODEC_ID_HAP, MKTAG('H', 'a', 'p', '5') }, { AV_CODEC_ID_HAP, MKTAG('H', 'a', 'p', 'Y') }, + { AV_CODEC_ID_DXV, MKTAG('D', 'X', 'D', '3') }, + { AV_CODEC_ID_DXV, MKTAG('D', 'X', 'D', 'I') }, + { AV_CODEC_ID_NONE, 0 }, }; |