Commit c61cdd0a authored by Stefano Sabatini's avatar Stefano Sabatini

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
parent 6d34323e
...@@ -13,6 +13,10 @@ libavutil: 2009-03-08 ...@@ -13,6 +13,10 @@ libavutil: 2009-03-08
API changes, most recent first: 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 2010-12-04 - r25886 - lavc 52.98.0 - CODEC_CAP_NEG_LINESIZES
Add CODEC_CAP_NEG_LINESIZES codec capability flag in avcodec.h. Add CODEC_CAP_NEG_LINESIZES codec capability flag in avcodec.h.
......
...@@ -33,7 +33,7 @@ ...@@ -33,7 +33,7 @@
#define LIBAVCODEC_VERSION_MAJOR 52 #define LIBAVCODEC_VERSION_MAJOR 52
#define LIBAVCODEC_VERSION_MINOR 99 #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, \ #define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \
LIBAVCODEC_VERSION_MINOR, \ LIBAVCODEC_VERSION_MINOR, \
...@@ -89,10 +89,6 @@ ...@@ -89,10 +89,6 @@
# define FF_INTERNALC_MEM_TYPE size_t # define FF_INTERNALC_MEM_TYPE size_t
#endif #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. * Identify the syntax and semantics of the bitstream.
* The principle is roughly: * The principle is roughly:
......
...@@ -27,7 +27,7 @@ ...@@ -27,7 +27,7 @@
#include "libavutil/avutil.h" #include "libavutil/avutil.h"
#define LIBAVCORE_VERSION_MAJOR 0 #define LIBAVCORE_VERSION_MAJOR 0
#define LIBAVCORE_VERSION_MINOR 15 #define LIBAVCORE_VERSION_MINOR 16
#define LIBAVCORE_VERSION_MICRO 0 #define LIBAVCORE_VERSION_MICRO 0
#define LIBAVCORE_VERSION_INT AV_VERSION_INT(LIBAVCORE_VERSION_MAJOR, \ #define LIBAVCORE_VERSION_INT AV_VERSION_INT(LIBAVCORE_VERSION_MAJOR, \
...@@ -55,6 +55,10 @@ const char *avcore_configuration(void); ...@@ -55,6 +55,10 @@ const char *avcore_configuration(void);
*/ */
const char *avcore_license(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. * Those FF_API_* defines are not part of public API.
* They may change, break or disappear at any time. * They may change, break or disappear at any time.
......
...@@ -23,10 +23,12 @@ ...@@ -23,10 +23,12 @@
#define AVFILTER_AVFILTER_H #define AVFILTER_AVFILTER_H
#include "libavutil/avutil.h" #include "libavutil/avutil.h"
#include "libavcore/avcore.h"
#include "libavcore/samplefmt.h"
#define LIBAVFILTER_VERSION_MAJOR 1 #define LIBAVFILTER_VERSION_MAJOR 1
#define LIBAVFILTER_VERSION_MINOR 68 #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, \ #define LIBAVFILTER_VERSION_INT AV_VERSION_INT(LIBAVFILTER_VERSION_MAJOR, \
LIBAVFILTER_VERSION_MINOR, \ LIBAVFILTER_VERSION_MINOR, \
...@@ -37,7 +39,6 @@ ...@@ -37,7 +39,6 @@
#define LIBAVFILTER_BUILD LIBAVFILTER_VERSION_INT #define LIBAVFILTER_BUILD LIBAVFILTER_VERSION_INT
#include <stddef.h> #include <stddef.h>
#include "libavcodec/avcodec.h"
/** /**
* Return the LIBAVFILTER_VERSION_INT constant. * Return the LIBAVFILTER_VERSION_INT constant.
......
...@@ -19,6 +19,7 @@ ...@@ -19,6 +19,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/ */
#include "libavcodec/avcodec.h" /* AVFrame */
#include "avfilter.h" #include "avfilter.h"
int av_vsrc_buffer_add_frame(AVFilterContext *buffer_filter, AVFrame *frame, int av_vsrc_buffer_add_frame(AVFilterContext *buffer_filter, AVFrame *frame,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment