diff options
| author | Stefano Sabatini <stefano.sabatini-lala@poste.it> | 2010-12-09 17:27:33 +0000 |
|---|---|---|
| committer | Stefano Sabatini <stefano.sabatini-lala@poste.it> | 2010-12-09 17:27:33 +0000 |
| commit | c61cdd0afb32fb6ea52d5f036d264d124e5cda7c (patch) | |
| tree | dc22df59452e6e163cf81d42acf4a660f3b9acfd | |
| parent | 6d34323ee65f63084309ba05b09c8c2a0fca9924 (diff) | |
| download | ffmpeg-c61cdd0afb32fb6ea52d5f036d264d124e5cda7c.tar.gz | |
Move AV_NOPTS_VALUE, AV_TIME_BASE, AV_TIME_BASE_Q symbols from
libavcodec to libavcore.
Remove another compile-time dependancy of libavfilter on libavcodec.
Originally committed as revision 25923 to svn://svn.ffmpeg.org/ffmpeg/trunk
| -rw-r--r-- | doc/APIchanges | 4 | ||||
| -rw-r--r-- | libavcodec/avcodec.h | 6 | ||||
| -rw-r--r-- | libavcore/avcore.h | 6 | ||||
| -rw-r--r-- | libavfilter/avfilter.h | 5 | ||||
| -rw-r--r-- | libavfilter/vsrc_buffer.h | 1 |
5 files changed, 14 insertions, 8 deletions
diff --git a/doc/APIchanges b/doc/APIchanges index a9ee5b89c2..fb5194f4f5 100644 --- a/doc/APIchanges +++ b/doc/APIchanges @@ -13,6 +13,10 @@ libavutil: 2009-03-08 API changes, most recent first: +2010-12-09 - r25923 - lavcore 0.16.0 - avcore.h + Move AV_NOPTS_VALUE, AV_TIME_BASE, AV_TIME_BASE_Q symbols from + avcodec.h to avcore.h. + 2010-12-04 - r25886 - lavc 52.98.0 - CODEC_CAP_NEG_LINESIZES Add CODEC_CAP_NEG_LINESIZES codec capability flag in avcodec.h. diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index 94ae9d3808..ecfc28be09 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -33,7 +33,7 @@ #define LIBAVCODEC_VERSION_MAJOR 52 #define LIBAVCODEC_VERSION_MINOR 99 -#define LIBAVCODEC_VERSION_MICRO 0 +#define LIBAVCODEC_VERSION_MICRO 1 #define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \ LIBAVCODEC_VERSION_MINOR, \ @@ -89,10 +89,6 @@ # define FF_INTERNALC_MEM_TYPE size_t #endif -#define AV_NOPTS_VALUE INT64_C(0x8000000000000000) -#define AV_TIME_BASE 1000000 -#define AV_TIME_BASE_Q (AVRational){1, AV_TIME_BASE} - /** * Identify the syntax and semantics of the bitstream. * The principle is roughly: diff --git a/libavcore/avcore.h b/libavcore/avcore.h index b19efe8cdb..714eac4bbf 100644 --- a/libavcore/avcore.h +++ b/libavcore/avcore.h @@ -27,7 +27,7 @@ #include "libavutil/avutil.h" #define LIBAVCORE_VERSION_MAJOR 0 -#define LIBAVCORE_VERSION_MINOR 15 +#define LIBAVCORE_VERSION_MINOR 16 #define LIBAVCORE_VERSION_MICRO 0 #define LIBAVCORE_VERSION_INT AV_VERSION_INT(LIBAVCORE_VERSION_MAJOR, \ @@ -55,6 +55,10 @@ const char *avcore_configuration(void); */ const char *avcore_license(void); +#define AV_NOPTS_VALUE INT64_C(0x8000000000000000) +#define AV_TIME_BASE 1000000 +#define AV_TIME_BASE_Q (AVRational){1, AV_TIME_BASE} + /** * Those FF_API_* defines are not part of public API. * They may change, break or disappear at any time. diff --git a/libavfilter/avfilter.h b/libavfilter/avfilter.h index 5d34bee1af..54cd9050f1 100644 --- a/libavfilter/avfilter.h +++ b/libavfilter/avfilter.h @@ -23,10 +23,12 @@ #define AVFILTER_AVFILTER_H #include "libavutil/avutil.h" +#include "libavcore/avcore.h" +#include "libavcore/samplefmt.h" #define LIBAVFILTER_VERSION_MAJOR 1 #define LIBAVFILTER_VERSION_MINOR 68 -#define LIBAVFILTER_VERSION_MICRO 0 +#define LIBAVFILTER_VERSION_MICRO 1 #define LIBAVFILTER_VERSION_INT AV_VERSION_INT(LIBAVFILTER_VERSION_MAJOR, \ LIBAVFILTER_VERSION_MINOR, \ @@ -37,7 +39,6 @@ #define LIBAVFILTER_BUILD LIBAVFILTER_VERSION_INT #include <stddef.h> -#include "libavcodec/avcodec.h" /** * Return the LIBAVFILTER_VERSION_INT constant. diff --git a/libavfilter/vsrc_buffer.h b/libavfilter/vsrc_buffer.h index fa204438d5..a77e42f36c 100644 --- a/libavfilter/vsrc_buffer.h +++ b/libavfilter/vsrc_buffer.h @@ -19,6 +19,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "libavcodec/avcodec.h" /* AVFrame */ #include "avfilter.h" int av_vsrc_buffer_add_frame(AVFilterContext *buffer_filter, AVFrame *frame, |