diff options
| author | Justin Ruggles <justin.ruggles@gmail.com> | 2014-02-04 15:40:32 -0500 |
|---|---|---|
| committer | Vittorio Giovara <vittorio.giovara@gmail.com> | 2015-01-06 17:05:53 +0100 |
| commit | 8e03ca2fff40ce065ea5a516200e777c96cd785e (patch) | |
| tree | 4807f8417df941863dce19e52c7737dc5edab8bc /libavformat/isom.c | |
| parent | 1c6183233d56fb27a4a154e7e64ecab98bd877f1 (diff) | |
| download | ffmpeg-8e03ca2fff40ce065ea5a516200e777c96cd785e.tar.gz | |
isom: add 'mp1v' fourcc
As referenced in the CoreMedia API docs.
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
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 5d10dca45e..5570d264d0 100644 --- a/libavformat/isom.c +++ b/libavformat/isom.c @@ -169,6 +169,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 */ |