[FFmpeg-cvslog] Support decoding "m1v " mpeg1video in mov.
Carl Eugen Hoyos
git at videolan.org
Tue Nov 8 10:41:20 CET 2011
ffmpeg | branch: master | Carl Eugen Hoyos <cehoyos at ag.or.at> | Tue Nov 8 10:33:21 2011 +0100| [8a3f976498cc096644b95ade7240a73e17d3a042] | committer: Carl Eugen Hoyos
Support decoding "m1v " mpeg1video in mov.
Fixes ticket #579 at least for ffplay.
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=8a3f976498cc096644b95ade7240a73e17d3a042
---
libavformat/isom.c | 1 +
libavformat/mov.c | 3 +++
2 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/libavformat/isom.c b/libavformat/isom.c
index c7272dd..457cc11 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 e6efe27..c107f11 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;
}
More information about the ffmpeg-cvslog
mailing list