diff options
| author | Evgeniy Stepanov <eugeni.stepanov@gmail.com> | 2008-01-27 15:43:17 +0000 |
|---|---|---|
| committer | Aurelien Jacobs <aurel@gnuage.org> | 2008-01-27 15:43:17 +0000 |
| commit | f8d7c9d373a8aeede75454a5d51de958b2321478 (patch) | |
| tree | 3417638f4bcfd2656c2bc4dad32b30b77bdd5975 /libavformat/matroska.c | |
| parent | 20963a71565b3d11815d0f9914c16aab873bd58b (diff) | |
| download | ffmpeg-f8d7c9d373a8aeede75454a5d51de958b2321478.tar.gz | |
Add support for Matroska attachments.
patch by eugeni _dot_ stepanov _at_ gmail.com and myself
Originally committed as revision 11635 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavformat/matroska.c')
| -rw-r--r-- | libavformat/matroska.c | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/libavformat/matroska.c b/libavformat/matroska.c index 382534e9bd..b62511f29f 100644 --- a/libavformat/matroska.c +++ b/libavformat/matroska.c @@ -71,3 +71,15 @@ const CodecTags ff_mkv_codec_tags[]={ {"" , CODEC_ID_NONE} /* TODO: AC3-9/10 (?), Real, Musepack, Quicktime */ }; + +const CodecMime ff_mkv_mime_tags[] = { + {"text/plain" , CODEC_ID_TEXT}, + {"image/gif" , CODEC_ID_GIF}, + {"image/jpeg" , CODEC_ID_MJPEG}, + {"image/png" , CODEC_ID_PNG}, + {"image/tiff" , CODEC_ID_TIFF}, + {"application/x-truetype-font", CODEC_ID_TTF}, + {"application/x-font" , CODEC_ID_TTF}, + + {"" , CODEC_ID_NONE} +}; |