aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJason Garrett-Glaser <darkshikari@gmail.com>2009-06-12 02:20:26 +0000
committerJason Garrett-Glaser <darkshikari@gmail.com>2009-06-12 02:20:26 +0000
commit14ed2d998339e6355b95d710aad53e5e777b2cd4 (patch)
tree04919bf5625fb1476da114bc06b813d55ca2d810
parentd468ff0fdfdd3ff8f54adea3dd1ef4b94cb8538d (diff)
downloadffmpeg-14ed2d998339e6355b95d710aad53e5e777b2cd4.tar.gz
Add "m2v1" to fourccs for MPEG-2 video; fixes some MOV files.
Originally committed as revision 19161 to svn://svn.ffmpeg.org/ffmpeg/trunk
-rw-r--r--libavformat/isom.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/libavformat/isom.c b/libavformat/isom.c
index 309aabca3a..b38d303022 100644
--- 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 */