Remove FF_CONST_AVUTIL55 cruft

Hendrik Leppkes committed 11 years ago

Commit 545559e1 parent 2df52083 files · +6 −14Browse files

Unified · Split

3 files

@@ -42,13 +42,13 @@ · 41 unmodified lines
42	42	#include <float.h>
43	43
44	44	#if FF_API_OLD_AVOPTIONS
45		−const AVOption av_next_option(FF_CONST_AVUTIL55 void obj, const AVOption *last)
	45	+const AVOption av_next_option(const void obj, const AVOption *last)
46	46	{
47	47	return av_opt_next(obj, last);
48	48	}
49	49	#endif
50	50
51		−const AVOption av_opt_next(FF_CONST_AVUTIL55 void obj, const AVOption *last)
	51	+const AVOption av_opt_next(const void obj, const AVOption *last)
52	52	{
53	53	const AVClass *class;
54	54	if (!obj)
@@ -1573,7 +1573,7 @@ static int opt_size(enum AVOptionType type) · 1518 unmodified lines
1573	1573	return 0;
1574	1574	}
1575	1575
1576		−int av_opt_copy(void dst, FF_CONST_AVUTIL55 void src)
	1576	+int av_opt_copy(void dst, const void src)
1577	1577	{
1578	1578	const AVOption *o = NULL;
1579	1579	const AVClass *c;

@@ -420,7 +420,7 @@ AVRational av_get_q(void obj, const char name, const AVOption **o_out); · 419 unmodified lines
420	420	attribute_deprecated
421	421	int64_t av_get_int(void obj, const char name, const AVOption **o_out);
422	422	attribute_deprecated const char av_get_string(void obj, const char name, const AVOption o_out, char buf, int buf_len);
423		−attribute_deprecated const AVOption av_next_option(FF_CONST_AVUTIL55 void obj, const AVOption *last);
	423	+attribute_deprecated const AVOption av_next_option(const void obj, const AVOption *last);
424	424	#endif
425	425
426	426	/**
@@ -683,7 +683,7 @@ const AVOption av_opt_find2(void obj, const char name, const char unit, · 256 unmodified lines
683	683	* or NULL
684	684	* @return next AVOption or NULL
685	685	*/
686		−const AVOption av_opt_next(FF_CONST_AVUTIL55 void obj, const AVOption *prev);
	686	+const AVOption av_opt_next(const void obj, const AVOption *prev);
687	687
688	688	/**
689	689	* Iterate over AVOptions-enabled children of obj.
@@ -835,7 +835,7 @@ int av_opt_query_ranges(AVOptionRanges *, void obj, const char *key, int flags · 145 unmodified lines
835	835	* @param src Object to copy into
836	836	* @return 0 on success, negative on error
837	837	*/
838		−int av_opt_copy(void dest, FF_CONST_AVUTIL55 void src);
	838	+int av_opt_copy(void dest, const void src);
839	839
840	840	/**
841	841	* Get a default list of allowed ranges for the given option.

@@ -115,14 +115,6 @@ · 114 unmodified lines
115	115	#define FF_API_FRAME_QP (LIBAVUTIL_VERSION_MAJOR < 56)
116	116	#endif
117	117
118		−#ifndef FF_CONST_AVUTIL55
119		−#if LIBAVUTIL_VERSION_MAJOR >= 55
120		−#define FF_CONST_AVUTIL55 const
121		−#else
122		−#define FF_CONST_AVUTIL55
123		−#endif
124		−#endif
125		−
126	118	/**
127	119	* @}
128	120	*/

Keyboard shortcuts