Mercurial > libavcodec.hg
comparison avcodec.h @ 6184:4ba171d6d84a libavcodec
Add support for Matroska attachments.
patch by eugeni _dot_ stepanov _at_ gmail.com and myself
author | aurel |
---|---|
date | Sun, 27 Jan 2008 15:43:17 +0000 |
parents | 34abda474ff7 |
children | 098f955eaec8 |
comparison
equal
deleted
inserted
replaced
6183:b65c4378ecfe | 6184:4ba171d6d84a |
---|---|
31 #include <sys/types.h> /* size_t */ | 31 #include <sys/types.h> /* size_t */ |
32 | 32 |
33 #define AV_STRINGIFY(s) AV_TOSTRING(s) | 33 #define AV_STRINGIFY(s) AV_TOSTRING(s) |
34 #define AV_TOSTRING(s) #s | 34 #define AV_TOSTRING(s) #s |
35 | 35 |
36 #define LIBAVCODEC_VERSION_INT ((51<<16)+(49<<8)+0) | 36 #define LIBAVCODEC_VERSION_INT ((51<<16)+(50<<8)+0) |
37 #define LIBAVCODEC_VERSION 51.49.0 | 37 #define LIBAVCODEC_VERSION 51.50.0 |
38 #define LIBAVCODEC_BUILD LIBAVCODEC_VERSION_INT | 38 #define LIBAVCODEC_BUILD LIBAVCODEC_VERSION_INT |
39 | 39 |
40 #define LIBAVCODEC_IDENT "Lavc" AV_STRINGIFY(LIBAVCODEC_VERSION) | 40 #define LIBAVCODEC_IDENT "Lavc" AV_STRINGIFY(LIBAVCODEC_VERSION) |
41 | 41 |
42 #define AV_NOPTS_VALUE INT64_C(0x8000000000000000) | 42 #define AV_NOPTS_VALUE INT64_C(0x8000000000000000) |
282 CODEC_ID_DVB_SUBTITLE, | 282 CODEC_ID_DVB_SUBTITLE, |
283 CODEC_ID_TEXT, ///< raw UTF-8 text | 283 CODEC_ID_TEXT, ///< raw UTF-8 text |
284 CODEC_ID_XSUB, | 284 CODEC_ID_XSUB, |
285 CODEC_ID_SSA, | 285 CODEC_ID_SSA, |
286 | 286 |
287 /* other specific kind of codecs (generaly used for attachments) */ | |
288 CODEC_ID_TTF= 0x18000, | |
289 | |
287 CODEC_ID_MPEG2TS= 0x20000, /**< _FAKE_ codec to indicate a raw MPEG-2 TS | 290 CODEC_ID_MPEG2TS= 0x20000, /**< _FAKE_ codec to indicate a raw MPEG-2 TS |
288 * stream (only used by libavformat) */ | 291 * stream (only used by libavformat) */ |
289 }; | 292 }; |
290 | 293 |
291 #if LIBAVCODEC_VERSION_INT < ((52<<16)+(0<<8)+0) | 294 #if LIBAVCODEC_VERSION_INT < ((52<<16)+(0<<8)+0) |
298 CODEC_TYPE_UNKNOWN = -1, | 301 CODEC_TYPE_UNKNOWN = -1, |
299 CODEC_TYPE_VIDEO, | 302 CODEC_TYPE_VIDEO, |
300 CODEC_TYPE_AUDIO, | 303 CODEC_TYPE_AUDIO, |
301 CODEC_TYPE_DATA, | 304 CODEC_TYPE_DATA, |
302 CODEC_TYPE_SUBTITLE, | 305 CODEC_TYPE_SUBTITLE, |
306 CODEC_TYPE_ATTACHMENT, | |
303 CODEC_TYPE_NB | 307 CODEC_TYPE_NB |
304 }; | 308 }; |
305 | 309 |
306 /** | 310 /** |
307 * Currently unused, may be used if 24/32 bits samples are ever supported. | 311 * Currently unused, may be used if 24/32 bits samples are ever supported. |