summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBenjamin Larsson <benjamin@southpole.se>2011-02-02 14:03:46 +0100
committerMans Rullgard <mans@mansr.com>2011-02-03 10:21:44 +0000
commitaa42cce57ddf34b4e2c365859206eb52e2415ff5 (patch)
tree0a013f81cf3c1378711c95f51c0aa922a485e77a
parent437fb1c87d7b4b0730db97d0858b4f39fffff2a9 (diff)
downloadffmpeg-streaming-aa42cce57ddf34b4e2c365859206eb52e2415ff5.zip
ffmpeg-streaming-aa42cce57ddf34b4e2c365859206eb52e2415ff5.tar.gz
Add AVC-Intra identifiers used by Flip4Mac for mov files
Signed-off-by: Mans Rullgard <mans@mansr.com>
-rw-r--r--libavformat/isom.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/libavformat/isom.c b/libavformat/isom.c
index 23ef82a..71a97b3 100644
--- a/libavformat/isom.c
+++ b/libavformat/isom.c
@@ -134,6 +134,8 @@ const AVCodecTag codec_movvideo_tags[] = {
{ CODEC_ID_RAWVIDEO, MKTAG('W', 'R', 'A', 'W') },
{ CODEC_ID_H264, MKTAG('a', 'v', 'c', '1') }, /* AVC-1/H.264 */
+ { CODEC_ID_H264, MKTAG('a', 'i', '5', '5') }, /* Flip4Mac AVC Intra 50 */
+ { CODEC_ID_H264, MKTAG('a', 'i', '1', '5') }, /* Flip4Mac AVC Intra 100 */
{ CODEC_ID_MPEG1VIDEO, MKTAG('m', '1', 'v', '1') }, /* Apple MPEG-1 Camcorder */
{ CODEC_ID_MPEG1VIDEO, MKTAG('m', 'p', 'e', 'g') }, /* MPEG */
OpenPOWER on IntegriCloud