Mercurial > libavutil.hg

comparison avutil.h @ 894:6be1c118d9d6 libavutil

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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 3e77728d53e1
children 0795a743bda1
comparison
equal deleted inserted replaced
893:76fd7478a2dc 894:6be1c118d9d6
38 #define AV_VERSION_INT(a, b, c) (a<<16 | b<<8 | c) 38 #define AV_VERSION_INT(a, b, c) (a<<16 | b<<8 | c)
39 #define AV_VERSION_DOT(a, b, c) a ##.## b ##.## c 39 #define AV_VERSION_DOT(a, b, c) a ##.## b ##.## c
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, \
47 LIBAVUTIL_VERSION_MINOR, \ 47 LIBAVUTIL_VERSION_MINOR, \
48 LIBAVUTIL_VERSION_MICRO) 48 LIBAVUTIL_VERSION_MICRO)
66 /** 66 /**
67 * Returns the libavutil license. 67 * Returns the libavutil license.
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"
74 #include "rational.h" 84 #include "rational.h"
75 #include "intfloat_readwrite.h" 85 #include "intfloat_readwrite.h"