diff options
| author | Luca Barbato <lu_zero@gentoo.org> | 2012-09-15 00:59:05 +0200 |
|---|---|---|
| committer | Luca Barbato <lu_zero@gentoo.org> | 2012-09-19 20:34:14 +0200 |
| commit | 117d8c6d1f1c187ffc6098d9618457e00534e013 (patch) | |
| tree | b3f68828285cefdfd27f45a198d50a99c10e9f12 /libavformat/matroska.c | |
| parent | 8071dca3d595a4fc5f9b3ee9f667e2c3e4a35517 (diff) | |
| download | ffmpeg-117d8c6d1f1c187ffc6098d9618457e00534e013.tar.gz | |
matroska: implement support for ProRes
Support Matroska native formatting.
On demuxing prepend a Frame container atom (32bit big endian encoded
frame size and 'icpf' string).
On muxing remove it.
Diffstat (limited to 'libavformat/matroska.c')
| -rw-r--r-- | libavformat/matroska.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/libavformat/matroska.c b/libavformat/matroska.c index 652e4d0b03..edb7ab7910 100644 --- a/libavformat/matroska.c +++ b/libavformat/matroska.c @@ -71,6 +71,7 @@ const CodecTags ff_mkv_codec_tags[]={ {"V_MPEG4/ISO/SP" , AV_CODEC_ID_MPEG4}, {"V_MPEG4/ISO/AVC" , AV_CODEC_ID_H264}, {"V_MPEG4/MS/V3" , AV_CODEC_ID_MSMPEG4V3}, + {"V_PRORES" , AV_CODEC_ID_PRORES}, {"V_REAL/RV10" , AV_CODEC_ID_RV10}, {"V_REAL/RV20" , AV_CODEC_ID_RV20}, {"V_REAL/RV30" , AV_CODEC_ID_RV30}, |