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 /libavcodec | |
| 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 'libavcodec')
| -rw-r--r-- | libavcodec/avcodec.h | 8 | ||||
| -rw-r--r-- | libavcodec/utils.c | 4 |
2 files changed, 10 insertions, 2 deletions
diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index bcf9fb6467..f8c81783aa 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -33,8 +33,8 @@ #define AV_STRINGIFY(s) AV_TOSTRING(s) #define AV_TOSTRING(s) #s -#define LIBAVCODEC_VERSION_INT ((51<<16)+(49<<8)+0) -#define LIBAVCODEC_VERSION 51.49.0 +#define LIBAVCODEC_VERSION_INT ((51<<16)+(50<<8)+0) +#define LIBAVCODEC_VERSION 51.50.0 #define LIBAVCODEC_BUILD LIBAVCODEC_VERSION_INT #define LIBAVCODEC_IDENT "Lavc" AV_STRINGIFY(LIBAVCODEC_VERSION) @@ -284,6 +284,9 @@ enum CodecID { CODEC_ID_XSUB, CODEC_ID_SSA, + /* other specific kind of codecs (generaly used for attachments) */ + CODEC_ID_TTF= 0x18000, + CODEC_ID_MPEG2TS= 0x20000, /**< _FAKE_ codec to indicate a raw MPEG-2 TS * stream (only used by libavformat) */ }; @@ -300,6 +303,7 @@ enum CodecType { CODEC_TYPE_AUDIO, CODEC_TYPE_DATA, CODEC_TYPE_SUBTITLE, + CODEC_TYPE_ATTACHMENT, CODEC_TYPE_NB }; diff --git a/libavcodec/utils.c b/libavcodec/utils.c index 4a8cb8a603..4ebc7c324b 100644 --- a/libavcodec/utils.c +++ b/libavcodec/utils.c @@ -1219,6 +1219,10 @@ void avcodec_string(char *buf, int buf_size, AVCodecContext *enc, int encode) snprintf(buf, buf_size, "Subtitle: %s", codec_name); bitrate = enc->bit_rate; break; + case CODEC_TYPE_ATTACHMENT: + snprintf(buf, buf_size, "Attachment: %s", codec_name); + bitrate = enc->bit_rate; + break; default: snprintf(buf, buf_size, "Invalid Codec type %d", enc->codec_type); return; |