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. Originally committed as revision 22736 to svn://svn.ffmpeg.org/ffmpeg/trunk
Unified · Split
| @@ -355,16 +355,6 @@ enum CodecID { · 354 unmodified lines | |||
| 355 | * stream (only used by libavformat) */ | 355 | * stream (only used by libavformat) */ |
| 356 | }; | 356 | }; |
| 357 | 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 | }; | ||
| 367 | |||
| 368 | #if LIBAVCODEC_VERSION_MAJOR < 53 | 358 | #if LIBAVCODEC_VERSION_MAJOR < 53 |
| 369 | #define CodecType AVMediaType | 359 | #define CodecType AVMediaType |
| 370 | 360 | ||
| @@ -40,7 +40,7 @@ · 39 unmodified lines | |||
| 40 | #define AV_VERSION(a, b, c) AV_VERSION_DOT(a, b, c) | 40 | #define AV_VERSION(a, b, c) AV_VERSION_DOT(a, b, c) |
| 41 | 41 | ||
| 42 | #define LIBAVUTIL_VERSION_MAJOR 50 | 42 | #define LIBAVUTIL_VERSION_MAJOR 50 |
| 43 | #define LIBAVUTIL_VERSION_MINOR 13 | 43 | #define LIBAVUTIL_VERSION_MINOR 14 |
| 44 | #define LIBAVUTIL_VERSION_MICRO 0 | 44 | #define LIBAVUTIL_VERSION_MICRO 0 |
| 45 | 45 | ||
| 46 | #define LIBAVUTIL_VERSION_INT AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \ | 46 | #define LIBAVUTIL_VERSION_INT AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \ |
| @@ -68,6 +68,16 @@ const char *avutil_configuration(void); · 21 unmodified lines | |||
| 68 | */ | 68 | */ |
| 69 | const char *avutil_license(void); | 69 | const char *avutil_license(void); |
| 70 | 70 | ||
| 71 | enum AVMediaType { | ||
| 72 | AVMEDIA_TYPE_UNKNOWN = -1, | ||
| 73 | AVMEDIA_TYPE_VIDEO, | ||
| 74 | AVMEDIA_TYPE_AUDIO, | ||
| 75 | AVMEDIA_TYPE_DATA, | ||
| 76 | AVMEDIA_TYPE_SUBTITLE, | ||
| 77 | AVMEDIA_TYPE_ATTACHMENT, | ||
| 78 | AVMEDIA_TYPE_NB | ||
| 79 | }; | ||
| 80 | |||
| 71 | #include "common.h" | 81 | #include "common.h" |
| 72 | #include "error.h" | 82 | #include "error.h" |
| 73 | #include "mathematics.h" | 83 | #include "mathematics.h" |