diff options
| author | Jason Garrett-Glaser <darkshikari@gmail.com> | 2009-06-13 03:02:16 +0000 |
|---|---|---|
| committer | Jason Garrett-Glaser <darkshikari@gmail.com> | 2009-06-13 03:02:16 +0000 |
| commit | 67fe5089165dd0edbee2b0aa6d8a802a5289fbec (patch) | |
| tree | 6184584b9c43cf47793c87e761a995bb4cf463a4 /libavformat/isom.c | |
| parent | eacfe8581d44b3eff13cf681be55f816118718e8 (diff) | |
| download | ffmpeg-67fe5089165dd0edbee2b0aa6d8a802a5289fbec.tar.gz | |
Analysis of logs show that there are in fact some files with m1v1 too (not just m2v2),
which is documented to be MPEG-1 video. Adding fourcc to isom.c.
Originally committed as revision 19180 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavformat/isom.c')
| -rw-r--r-- | libavformat/isom.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/libavformat/isom.c b/libavformat/isom.c index 0a410c17c4..34f69aa8d3 100644 --- a/libavformat/isom.c +++ b/libavformat/isom.c @@ -117,6 +117,7 @@ const AVCodecTag codec_movvideo_tags[] = { { CODEC_ID_H264, MKTAG('a', 'v', 'c', '1') }, /* AVC-1/H.264 */ { CODEC_ID_MPEG1VIDEO, MKTAG('m', 'p', 'e', 'g') }, /* MPEG */ + { CODEC_ID_MPEG1VIDEO, MKTAG('m', '1', 'v', '1') }, { CODEC_ID_MPEG2VIDEO, MKTAG('h', 'd', 'v', '1') }, /* MPEG2 HDV 720p30 */ { CODEC_ID_MPEG2VIDEO, MKTAG('h', 'd', 'v', '2') }, /* MPEG2 HDV 1080i60 */ { CODEC_ID_MPEG2VIDEO, MKTAG('h', 'd', 'v', '3') }, /* MPEG2 HDV 1080i50 */ |