diff options
| author | Carl Eugen Hoyos <cehoyos@ag.or.at> | 2013-10-18 07:50:50 +0200 |
|---|---|---|
| committer | Vittorio Giovara <vittorio.giovara@gmail.com> | 2014-03-09 18:09:38 +0100 |
| commit | eeae858596a5ce5a84797283f590a16add5704f4 (patch) | |
| tree | 9aa0105dbe5707c134834f34f8b9d45efb8b17c9 /libavformat/isom.c | |
| parent | c09804684a47e6572ee82ded5d84c8b282815da6 (diff) | |
| download | ffmpeg-eeae858596a5ce5a84797283f590a16add5704f4.tar.gz | |
isom: Support Sony XAVC in mov
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 f70f982bb1..c5b8b606b2 100644 --- a/libavformat/isom.c +++ b/libavformat/isom.c @@ -153,6 +153,7 @@ const AVCodecTag ff_codec_movvideo_tags[] = { { AV_CODEC_ID_H264, MKTAG('a', 'i', '1', '5') }, /* AVC-Intra 100M 1080i50 */ { AV_CODEC_ID_H264, MKTAG('a', 'i', '1', '6') }, /* AVC-Intra 100M 1080i60 */ { 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 */ |