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

Stefano Sabatini committed 15 years ago

Commit c61cdd01 parent 6d343235 files · +14 −8Browse files

Unified · Split

5 files

@@ -13,6 +13,10 @@ libavutil: 2009-03-08 · 12 unmodified lines
13	13
14	14	API changes, most recent first:
15	15
	16	+2010-12-09 - r25923 - lavcore 0.16.0 - avcore.h
	17	+ Move AV_NOPTS_VALUE, AV_TIME_BASE, AV_TIME_BASE_Q symbols from
	18	+ avcodec.h to avcore.h.
	19	+
16	20	2010-12-04 - r25886 - lavc 52.98.0 - CODEC_CAP_NEG_LINESIZES
17	21	Add CODEC_CAP_NEG_LINESIZES codec capability flag in avcodec.h.
18	22

@@ -33,7 +33,7 @@ · 32 unmodified lines
33	33
34	34	#define LIBAVCODEC_VERSION_MAJOR 52
35	35	#define LIBAVCODEC_VERSION_MINOR 99
36		−#define LIBAVCODEC_VERSION_MICRO 0
	36	+#define LIBAVCODEC_VERSION_MICRO 1
37	37
38	38	#define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \
39	39	LIBAVCODEC_VERSION_MINOR, \
@@ -89,10 +89,6 @@ · 49 unmodified lines
89	89	# define FF_INTERNALC_MEM_TYPE size_t
90	90	#endif
91	91
92		−#define AV_NOPTS_VALUE INT64_C(0x8000000000000000)
93		−#define AV_TIME_BASE 1000000
94		−#define AV_TIME_BASE_Q (AVRational){1, AV_TIME_BASE}
95		−
96	92	/**
97	93	* Identify the syntax and semantics of the bitstream.
98	94	* The principle is roughly:

@@ -27,7 +27,7 @@ · 26 unmodified lines
27	27	#include "libavutil/avutil.h"
28	28
29	29	#define LIBAVCORE_VERSION_MAJOR 0
30		−#define LIBAVCORE_VERSION_MINOR 15
	30	+#define LIBAVCORE_VERSION_MINOR 16
31	31	#define LIBAVCORE_VERSION_MICRO 0
32	32
33	33	#define LIBAVCORE_VERSION_INT AV_VERSION_INT(LIBAVCORE_VERSION_MAJOR, \
@@ -55,6 +55,10 @@ const char *avcore_configuration(void); · 21 unmodified lines
55	55	*/
56	56	const char *avcore_license(void);
57	57
	58	+#define AV_NOPTS_VALUE INT64_C(0x8000000000000000)
	59	+#define AV_TIME_BASE 1000000
	60	+#define AV_TIME_BASE_Q (AVRational){1, AV_TIME_BASE}
	61	+
58	62	/**
59	63	* Those FF_API_* defines are not part of public API.
60	64	* They may change, break or disappear at any time.

@@ -23,10 +23,12 @@ · 22 unmodified lines
23	23	#define AVFILTER_AVFILTER_H
24	24
25	25	#include "libavutil/avutil.h"
	26	+#include "libavcore/avcore.h"
	27	+#include "libavcore/samplefmt.h"
26	28
27	29	#define LIBAVFILTER_VERSION_MAJOR 1
28	30	#define LIBAVFILTER_VERSION_MINOR 68
29		−#define LIBAVFILTER_VERSION_MICRO 0
	31	+#define LIBAVFILTER_VERSION_MICRO 1
30	32
31	33	#define LIBAVFILTER_VERSION_INT AV_VERSION_INT(LIBAVFILTER_VERSION_MAJOR, \
32	34	LIBAVFILTER_VERSION_MINOR, \
@@ -37,7 +39,6 @@ · 4 unmodified lines
37	39	#define LIBAVFILTER_BUILD LIBAVFILTER_VERSION_INT
38	40
39	41	#include <stddef.h>
40		−#include "libavcodec/avcodec.h"
41	42
42	43	/**
43	44	* Return the LIBAVFILTER_VERSION_INT constant.

@@ -19,6 +19,7 @@ · 18 unmodified lines
19	19	* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
20	20	*/
21	21
	22	+#include "libavcodec/avcodec.h" /* AVFrame */
22	23	#include "avfilter.h"
23	24
24	25	int av_vsrc_buffer_add_frame(AVFilterContext buffer_filter, AVFrame frame,

Keyboard shortcuts