diff options
| author | Benjamin Larsson <benjamin@southpole.se> | 2011-03-09 10:55:20 +0100 |
|---|---|---|
| committer | Ronald S. Bultje <rsbultje@gmail.com> | 2011-03-10 20:32:32 -0500 |
| commit | 35d7d6f7489c75aaa2fcb39820fb25b0fd44524b (patch) | |
| tree | 30ce1f63d6a03ccc3cbf99d65ec28621b6fbf878 | |
| parent | aecd0a44962a6531340d1439be094c577d711014 (diff) | |
| download | ffmpeg-35d7d6f7489c75aaa2fcb39820fb25b0fd44524b.tar.gz | |
Add one more avc intra fourcc and extend the description
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
| -rw-r--r-- | libavformat/isom.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/libavformat/isom.c b/libavformat/isom.c index 3a0d34874d..3576094ee8 100644 --- a/libavformat/isom.c +++ b/libavformat/isom.c @@ -134,10 +134,11 @@ 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') }, /* AVC Intra 50 / 1080 */ + { CODEC_ID_H264, MKTAG('a', 'i', '5', '5') }, /* AVC Intra 50 / 1080 interlace */ { CODEC_ID_H264, MKTAG('a', 'i', '5', 'q') }, /* AVC Intra 50 / 720 */ - { CODEC_ID_H264, MKTAG('a', 'i', '1', '5') }, /* AVC Intra 100 / 1080 */ + { CODEC_ID_H264, MKTAG('a', 'i', '1', '5') }, /* AVC Intra 100 / 1080 interlace */ { CODEC_ID_H264, MKTAG('a', 'i', '1', 'q') }, /* AVC Intra 100 / 720 */ + { CODEC_ID_H264, MKTAG('a', 'i', '1', '2') }, /* AVC Intra 100 / 1080 */ { CODEC_ID_MPEG1VIDEO, MKTAG('m', '1', 'v', '1') }, /* Apple MPEG-1 Camcorder */ { CODEC_ID_MPEG1VIDEO, MKTAG('m', 'p', 'e', 'g') }, /* MPEG */ |