Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/FFmpeg/FFmpeg.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarl Eugen Hoyos <cehoyos@ag.or.at>2011-11-08 13:33:21 +0400
committerCarl Eugen Hoyos <cehoyos@ag.or.at>2011-11-08 13:33:21 +0400
commit8a3f976498cc096644b95ade7240a73e17d3a042 (patch)
tree2c916802f8e70bc21b63dcd74316c65a618c63a3 /libavformat/isom.c
parent6aaf6db253062f84024d2b581e210122077f2c1a (diff)
Support decoding "m1v " mpeg1video in mov.
Fixes ticket #579 at least for ffplay.
Diffstat (limited to 'libavformat/isom.c')
-rw-r--r--libavformat/isom.c1
1 files changed, 1 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 */