[FFmpeg-cvslog] Add more AVC Intra FOURCCs
Benjamin Larsson
git
Wed Feb 23 19:04:39 CET 2011
ffmpeg | branch: master | Benjamin Larsson <benjamin at southpole.se> | Tue Feb 8 11:05:05 2011 +0100| [8e35f5d4fad523c1a1f0a4d9e4b74e7f1c5b990d] | committer: Michael Niedermayer
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 at gmail.com>
(cherry picked from commit 8f935b9271052be8f97d655081b94b68b6c23bfb)
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=8e35f5d4fad523c1a1f0a4d9e4b74e7f1c5b990d
---
libavformat/isom.c | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/libavformat/isom.c b/libavformat/isom.c
index 8534cb8..3a0d348 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 */
More information about the ffmpeg-cvslog
mailing list