git.videolan.org
/
ffmpeg.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
d468ff0
)
Add "m2v1" to fourccs for MPEG-2 video; fixes some MOV files.
author
Jason Garrett-Glaser
<darkshikari@gmail.com>
Fri, 12 Jun 2009 02:20:26 +0000
(
02:20
+0000)
committer
Jason Garrett-Glaser
<darkshikari@gmail.com>
Fri, 12 Jun 2009 02:20:26 +0000
(
02:20
+0000)
Originally committed as revision 19161 to svn://svn.ffmpeg.org/ffmpeg/trunk
libavformat/isom.c
patch
|
blob
|
history
diff --git
a/libavformat/isom.c
b/libavformat/isom.c
index
309aabc
..
b38d303
100644
(file)
--- a/
libavformat/isom.c
+++ b/
libavformat/isom.c
@@
-153,6
+153,7
@@
const AVCodecTag codec_movvideo_tags[] = {
{ CODEC_ID_MPEG2VIDEO, MKTAG('x', 'd', 'v', 'e') }, /* XDCAM EX 1080p25 VBR */
{ CODEC_ID_MPEG2VIDEO, MKTAG('x', 'd', 'v', 'f') }, /* XDCAM EX 1080p30 VBR */
{ CODEC_ID_MPEG2VIDEO, MKTAG('A', 'V', 'm', 'p') }, /* AVID IMX PAL */
+ { CODEC_ID_MPEG2VIDEO, MKTAG('m', '2', 'v', '1') },
{ CODEC_ID_JPEG2000, MKTAG('m', 'j', 'p', '2') }, /* JPEG 2000 produced by FCP */