diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-03-09 22:07:28 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-03-09 22:11:08 +0100 |
| commit | 2f41b186963d6ad8c653133ad2ab7d36960cfcbc (patch) | |
| tree | 4c82c24414643233f0d6a1a12cb9d194c6011d6d /libavformat/isom.c | |
| parent | 8a5397d88b8cebd82962cca5ed8688f0ce056f18 (diff) | |
| parent | eeae858596a5ce5a84797283f590a16add5704f4 (diff) | |
Merge commit 'eeae858596a5ce5a84797283f590a16add5704f4'
* commit 'eeae858596a5ce5a84797283f590a16add5704f4':
isom: Support Sony XAVC in mov
See: 5b9f39860d83380c4af3039710b4fcf3ea1f4c99
See: 6e65e3483706d969d176909fae9e216919f59277
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 f234197927..4bdbfbbc82 100644 --- a/libavformat/isom.c +++ b/libavformat/isom.c @@ -169,6 +169,7 @@ const AVCodecTag ff_codec_movvideo_tags[] = { { AV_CODEC_ID_H264, MKTAG('a', 'i', '1', '6') }, /* AVC-Intra 100M 1080i60 */ { AV_CODEC_ID_H264, MKTAG('a', 'i', 'v', 'x') }, /* XAVC 4:2:2 10bit */ { AV_CODEC_ID_H264, MKTAG('A', 'V', 'i', 'n') }, /* AVC-Intra with implicit SPS/PPS */ + { AV_CODEC_ID_H264, MKTAG('a', 'i', 'v', 'x') }, /* XAVC 4:2:2 10bit */ { AV_CODEC_ID_MPEG1VIDEO, MKTAG('m', '1', 'v', '1') }, /* Apple MPEG-1 Camcorder */ { AV_CODEC_ID_MPEG1VIDEO, MKTAG('m', 'p', 'e', 'g') }, /* MPEG */ |