diff options
| author | Carl Eugen Hoyos <cehoyos@ag.or.at> | 2011-11-08 10:33:21 +0100 |
|---|---|---|
| committer | Carl Eugen Hoyos <cehoyos@ag.or.at> | 2011-11-08 10:33:21 +0100 |
| commit | 8a3f976498cc096644b95ade7240a73e17d3a042 (patch) | |
| tree | 2c916802f8e70bc21b63dcd74316c65a618c63a3 /libavformat | |
| parent | 6aaf6db253062f84024d2b581e210122077f2c1a (diff) | |
| download | ffmpeg-8a3f976498cc096644b95ade7240a73e17d3a042.tar.gz | |
Support decoding "m1v " mpeg1video in mov.
Fixes ticket #579 at least for ffplay.
Diffstat (limited to 'libavformat')
| -rw-r--r-- | libavformat/isom.c | 1 | ||||
| -rw-r--r-- | libavformat/mov.c | 3 |
2 files changed, 4 insertions, 0 deletions
diff --git a/libavformat/isom.c b/libavformat/isom.c index c7272ddc9c..457cc117e2 100644 --- a/libavformat/isom.c +++ b/libavformat/isom.c @@ -154,6 +154,7 @@ const AVCodecTag codec_movvideo_tags[] = { { CODEC_ID_MPEG1VIDEO, MKTAG('m', '1', 'v', '1') }, /* Apple MPEG-1 Camcorder */ { CODEC_ID_MPEG1VIDEO, MKTAG('m', 'p', 'e', 'g') }, /* MPEG */ + { CODEC_ID_MPEG1VIDEO, MKTAG('m', '1', 'v', ' ') }, { CODEC_ID_MPEG2VIDEO, MKTAG('m', '2', 'v', '1') }, /* Apple MPEG-2 Camcorder */ { CODEC_ID_MPEG2VIDEO, MKTAG('h', 'd', 'v', '1') }, /* MPEG2 HDV 720p30 */ { CODEC_ID_MPEG2VIDEO, MKTAG('h', 'd', 'v', '2') }, /* MPEG2 HDV 1080i60 */ diff --git a/libavformat/mov.c b/libavformat/mov.c index e6efe27195..c107f11f51 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -1378,6 +1378,9 @@ int ff_mov_read_stsd_entries(MOVContext *c, AVIOContext *pb, int entries) case CODEC_ID_AC3: st->need_parsing = AVSTREAM_PARSE_FULL; break; + case CODEC_ID_MPEG1VIDEO: + st->need_parsing = AVSTREAM_PARSE_FULL; + break; default: break; } |