aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBenjamin Larsson <benjamin@southpole.se>2011-02-08 11:05:05 +0100
committerRonald S. Bultje <rsbultje@gmail.com>2011-02-22 07:21:33 -0500
commit8f935b9271052be8f97d655081b94b68b6c23bfb (patch)
treef06453308e2f2530f6202e051d9a23a3d57de64d
parente22910b21a6c78b0159f98426b10c204f12bc15a (diff)
downloadffmpeg-8f935b9271052be8f97d655081b94b68b6c23bfb.tar.gz
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 <rsbultje@gmail.com>
-rw-r--r--libavformat/isom.c6
1 files changed, 4 insertions, 2 deletions
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 */