diff options
| author | Stefano Sabatini <stefano.sabatini-lala@poste.it> | 2010-03-30 23:31:16 +0000 |
|---|---|---|
| committer | Stefano Sabatini <stefano.sabatini-lala@poste.it> | 2010-03-30 23:31:16 +0000 |
| commit | 11491503c492f3a3ce190e2ee8cec660d3b91e1d (patch) | |
| tree | f75269f2137ba6be9de4bad888ab24811b640c9a | |
| parent | 72415b2adb2c25f95ceede49001bb97ed9247dbb (diff) | |
| download | ffmpeg-11491503c492f3a3ce190e2ee8cec660d3b91e1d.tar.gz | |
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.
Originally committed as revision 22736 to svn://svn.ffmpeg.org/ffmpeg/trunk
| -rw-r--r-- | libavcodec/avcodec.h | 10 | ||||
| -rw-r--r-- | libavutil/avutil.h | 12 |
2 files changed, 11 insertions, 11 deletions
diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index 2fb4fd49df..183d8e63ad 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -355,16 +355,6 @@ enum CodecID { * stream (only used by libavformat) */ }; -enum AVMediaType { - AVMEDIA_TYPE_UNKNOWN = -1, - AVMEDIA_TYPE_VIDEO, - AVMEDIA_TYPE_AUDIO, - AVMEDIA_TYPE_DATA, - AVMEDIA_TYPE_SUBTITLE, - AVMEDIA_TYPE_ATTACHMENT, - AVMEDIA_TYPE_NB -}; - #if LIBAVCODEC_VERSION_MAJOR < 53 #define CodecType AVMediaType diff --git a/libavutil/avutil.h b/libavutil/avutil.h index 968787c256..1523de6753 100644 --- a/libavutil/avutil.h +++ b/libavutil/avutil.h @@ -40,7 +40,7 @@ #define AV_VERSION(a, b, c) AV_VERSION_DOT(a, b, c) #define LIBAVUTIL_VERSION_MAJOR 50 -#define LIBAVUTIL_VERSION_MINOR 13 +#define LIBAVUTIL_VERSION_MINOR 14 #define LIBAVUTIL_VERSION_MICRO 0 #define LIBAVUTIL_VERSION_INT AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \ @@ -68,6 +68,16 @@ const char *avutil_configuration(void); */ const char *avutil_license(void); +enum AVMediaType { + AVMEDIA_TYPE_UNKNOWN = -1, + AVMEDIA_TYPE_VIDEO, + AVMEDIA_TYPE_AUDIO, + AVMEDIA_TYPE_DATA, + AVMEDIA_TYPE_SUBTITLE, + AVMEDIA_TYPE_ATTACHMENT, + AVMEDIA_TYPE_NB +}; + #include "common.h" #include "error.h" #include "mathematics.h" |