From e14725cecc1941f5b87209b8846dbea34b64a3c1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Brochet?= Date: Sun, 9 Sep 2012 11:00:27 +0200 Subject: [PATCH] add OTF support for attachments Signed-off-by: Michael Niedermayer --- libavcodec/avcodec.h | 1 + libavcodec/old_codec_ids.h | 1 + libavformat/matroska.c | 1 + 3 files changed, 3 insertions(+) diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index 199dd3ba5f..ddf785e68a 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -455,6 +455,7 @@ enum AVCodecID { AV_CODEC_ID_BINTEXT = MKBETAG('B','T','X','T'), AV_CODEC_ID_XBIN = MKBETAG('X','B','I','N'), AV_CODEC_ID_IDF = MKBETAG( 0 ,'I','D','F'), + AV_CODEC_ID_OTF = MKBETAG( 0 ,'O','T','F'), AV_CODEC_ID_PROBE = 0x19000, ///< codec_id is not known (like AV_CODEC_ID_NONE) but lavf should attempt to identify it diff --git a/libavcodec/old_codec_ids.h b/libavcodec/old_codec_ids.h index c0ac95101f..ded4cc7877 100644 --- a/libavcodec/old_codec_ids.h +++ b/libavcodec/old_codec_ids.h @@ -385,6 +385,7 @@ CODEC_ID_BINTEXT = MKBETAG('B','T','X','T'), CODEC_ID_XBIN = MKBETAG('X','B','I','N'), CODEC_ID_IDF = MKBETAG( 0 ,'I','D','F'), + CODEC_ID_OTF = MKBETAG( 0 ,'O','T','F'), CODEC_ID_PROBE = 0x19000, ///< codec_id is not known (like CODEC_ID_NONE) but lavf should attempt to identify it diff --git a/libavformat/matroska.c b/libavformat/matroska.c index b016491018..e13acff4f8 100644 --- a/libavformat/matroska.c +++ b/libavformat/matroska.c @@ -93,6 +93,7 @@ const CodecMime ff_mkv_mime_tags[] = { {"image/tiff" , AV_CODEC_ID_TIFF}, {"application/x-truetype-font", AV_CODEC_ID_TTF}, {"application/x-font" , AV_CODEC_ID_TTF}, + {"application/vnd.ms-opentype", AV_CODEC_ID_OTF}, {"" , AV_CODEC_ID_NONE} };