Merge commit 'a31c4b2cbef9aee15910fc3df52519aef46760de'

[ffmpeg] / libavformat / isom.c

diff --git a/libavformat/isom.c b/libavformat/isom.c
index c99f2dc5db147da841b5987ce9e3f6cd678b8392..db9129bcacbd7cd9006e426a075d3c0e8d0c3342 100644 (file)
--- a/libavformat/isom.c
+++ b/libavformat/isom.c
@@ -258,6 +258,10 @@ const AVCodecTag ff_codec_movvideo_tags[] = {
 
     { AV_CODEC_ID_AIC, MKTAG('i', 'c', 'o', 'd') },
 
+    { AV_CODEC_ID_HAP, MKTAG('H', 'a', 'p', '1') },
+    { AV_CODEC_ID_HAP, MKTAG('H', 'a', 'p', '5') },
+    { AV_CODEC_ID_HAP, MKTAG('H', 'a', 'p', 'Y') },
+
     { AV_CODEC_ID_NONE, 0 },
 };