From: Benjamin Larsson Date: Tue, 8 Feb 2011 10:05:05 +0000 (+0100) Subject: Add more AVC Intra FOURCCs X-Git-Tag: android-x86-4.4-r1~18327 X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=8e35f5d4fad523c1a1f0a4d9e4b74e7f1c5b990d;p=android-x86%2Fexternal-ffmpeg.git Add more AVC Intra FOURCCs Also change the comments a bit since the FOURCCs aren't specific to Flip4Mac and different ones are used for 720 versus 1080 lines. Signed-off-by: Ronald S. Bultje (cherry picked from commit 8f935b9271052be8f97d655081b94b68b6c23bfb) --- diff --git a/libavformat/isom.c b/libavformat/isom.c index 8534cb8898..3a0d34874d 100644 --- a/libavformat/isom.c +++ b/libavformat/isom.c @@ -134,8 +134,10 @@ 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_H264, MKTAG('a', 'i', '5', '5') }, /* AVC Intra 50 / 1080 */ + { 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', 'q') }, /* AVC Intra 100 / 720 */ { CODEC_ID_MPEG1VIDEO, MKTAG('m', '1', 'v', '1') }, /* Apple MPEG-1 Camcorder */ { CODEC_ID_MPEG1VIDEO, MKTAG('m', 'p', 'e', 'g') }, /* MPEG */