OSDN Git Service
(root)
/
android-x86
/
external-ffmpeg.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
437fb1c
)
Add AVC-Intra identifiers used by Flip4Mac for mov files
author
Benjamin Larsson
<benjamin@southpole.se>
Wed, 2 Feb 2011 13:03:46 +0000
(14:03 +0100)
committer
Mans Rullgard
<mans@mansr.com>
Thu, 3 Feb 2011 10:21:44 +0000
(10:21 +0000)
Signed-off-by: Mans Rullgard <mans@mansr.com>
libavformat/isom.c
patch
|
blob
|
history
diff --git
a/libavformat/isom.c
b/libavformat/isom.c
index
23ef82a
..
71a97b3
100644
(file)
--- 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 */