diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-01-07 00:29:42 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-01-07 00:31:05 +0100 |
| commit | 4009ee3eccac686ee2f01837cc8877012c47314c (patch) | |
| tree | 15a77fa4b0384ff8e7b05fb1e14d5dbfcc9a927d /libavformat/isom.c | |
| parent | 89388cf60bd5baa5991ee215a23d44f6d6b0c385 (diff) | |
| parent | 8e03ca2fff40ce065ea5a516200e777c96cd785e (diff) | |
| download | ffmpeg-4009ee3eccac686ee2f01837cc8877012c47314c.tar.gz | |
Merge commit '8e03ca2fff40ce065ea5a516200e777c96cd785e'
* commit '8e03ca2fff40ce065ea5a516200e777c96cd785e':
isom: add 'mp1v' fourcc
Merged-by: Michael Niedermayer <michaelni@gmx.at>
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 150902198b..01d3dd29f0 100644 --- a/libavformat/isom.c +++ b/libavformat/isom.c @@ -177,6 +177,7 @@ const AVCodecTag ff_codec_movvideo_tags[] = { { AV_CODEC_ID_MPEG1VIDEO, MKTAG('m', '1', 'v', ' ') }, { AV_CODEC_ID_MPEG1VIDEO, MKTAG('m', '1', 'v', '1') }, /* Apple MPEG-1 Camcorder */ { AV_CODEC_ID_MPEG1VIDEO, MKTAG('m', 'p', 'e', 'g') }, /* MPEG */ + { AV_CODEC_ID_MPEG1VIDEO, MKTAG('m', 'p', '1', 'v') }, /* CoreMedia CMVideoCodecType */ { AV_CODEC_ID_MPEG2VIDEO, MKTAG('m', '2', 'v', '1') }, /* Apple MPEG-2 Camcorder */ { AV_CODEC_ID_MPEG2VIDEO, MKTAG('h', 'd', 'v', '1') }, /* MPEG2 HDV 720p30 */ { AV_CODEC_ID_MPEG2VIDEO, MKTAG('h', 'd', 'v', '2') }, /* MPEG2 HDV 1080i60 */ |