Mercurial > libavcodec.hg
comparison avcodec.h @ 11561:dcf8221ed29f libavcodec
Move AVMediaType from libavcodec to libavutil.
This allows applications/libraries which require that symbol
(e.g. libavfilter) to be compiled without to depend on the presence of
libavcodec/avcodec.h, which may not be installed.
author | stefano |
---|---|
date | Tue, 30 Mar 2010 23:31:16 +0000 |
parents | 8a4984c5cacc |
children | 5111783be6ad |
comparison
equal
deleted
inserted
replaced
11560:8a4984c5cacc | 11561:dcf8221ed29f |
---|---|
351 | 351 |
352 CODEC_ID_PROBE= 0x19000, ///< codec_id is not known (like CODEC_ID_NONE) but lavf should attempt to identify it | 352 CODEC_ID_PROBE= 0x19000, ///< codec_id is not known (like CODEC_ID_NONE) but lavf should attempt to identify it |
353 | 353 |
354 CODEC_ID_MPEG2TS= 0x20000, /**< _FAKE_ codec to indicate a raw MPEG-2 TS | 354 CODEC_ID_MPEG2TS= 0x20000, /**< _FAKE_ codec to indicate a raw MPEG-2 TS |
355 * stream (only used by libavformat) */ | 355 * stream (only used by libavformat) */ |
356 }; | |
357 | |
358 enum AVMediaType { | |
359 AVMEDIA_TYPE_UNKNOWN = -1, | |
360 AVMEDIA_TYPE_VIDEO, | |
361 AVMEDIA_TYPE_AUDIO, | |
362 AVMEDIA_TYPE_DATA, | |
363 AVMEDIA_TYPE_SUBTITLE, | |
364 AVMEDIA_TYPE_ATTACHMENT, | |
365 AVMEDIA_TYPE_NB | |
366 }; | 356 }; |
367 | 357 |
368 #if LIBAVCODEC_VERSION_MAJOR < 53 | 358 #if LIBAVCODEC_VERSION_MAJOR < 53 |
369 #define CodecType AVMediaType | 359 #define CodecType AVMediaType |
370 | 360 |