summaryrefslogtreecommitdiffstats
path: root/libavformat/isom.c
diff options
context:
space:
mode:
authorPaul B Mahol <onemda@gmail.com>2016-12-02 20:30:50 +0100
committerPaul B Mahol <onemda@gmail.com>2016-12-22 22:47:06 +0100
commit73651090ca1183f37753ee30a7e206ca4fb9f4f0 (patch)
treedf813c0664d788cedbe5298da30a80ddc31de9dc /libavformat/isom.c
parentfdcb7a85cf2aed85ba5a315440051f88e08bc6f5 (diff)
downloadffmpeg-streaming-73651090ca1183f37753ee30a7e206ca4fb9f4f0.zip
ffmpeg-streaming-73651090ca1183f37753ee30a7e206ca4fb9f4f0.tar.gz
avcodec: add Apple Pixlet decoder
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Diffstat (limited to 'libavformat/isom.c')
-rw-r--r--libavformat/isom.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/libavformat/isom.c b/libavformat/isom.c
index ae10cb7..13ceef0 100644
--- a/libavformat/isom.c
+++ b/libavformat/isom.c
@@ -296,6 +296,8 @@ const AVCodecTag ff_codec_movvideo_tags[] = {
{ AV_CODEC_ID_SHEERVIDEO, MKTAG('S', 'h', 'r', '6') },
{ AV_CODEC_ID_SHEERVIDEO, MKTAG('S', 'h', 'r', '7') },
+ { AV_CODEC_ID_PIXLET, MKTAG('p', 'x', 'l', 't') },
+
{ AV_CODEC_ID_NONE, 0 },
};
OpenPOWER on IntegriCloud