diff options
| author | Benjamin Larsson <benjamin@southpole.se> | 2011-02-02 14:03:46 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-02-04 03:10:10 +0100 |
| commit | d25d1d06a4805f0d119e75387c35017b420a691e (patch) | |
| tree | e7c957b23faad146e0a41b0914861205eb08eea6 | |
| parent | e31a7441559373d5c4aef4f359404c9dfcf16e42 (diff) | |
| download | ffmpeg-d25d1d06a4805f0d119e75387c35017b420a691e.tar.gz | |
Add AVC-Intra identifiers used by Flip4Mac for mov files
Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit aa42cce57ddf34b4e2c365859206eb52e2415ff5)
| -rw-r--r-- | libavformat/isom.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/libavformat/isom.c b/libavformat/isom.c index 23ef82a1ce..71a97b37fc 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 */ |