Merge commit '8e03ca2fff40ce065ea5a516200e777c96cd785e'

* commit '8e03ca2fff40ce065ea5a516200e777c96cd785e': isom: add 'mp1v' fourcc Merged-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago · 4009ee3ecc
parent 89388cf60b 8e03ca2fff
commit 4009ee3ecc
1 changed files with 1 additions and 0 deletions
--- 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 */