apps/ffmpeg-rockchip
1
0
Fork 0
mirror of https://github.com/nyanmisaka/ffmpeg-rockchip.git synced 2025-10-31 12:36:41 +08:00
Code Issues Packages Projects Releases Wiki Activity

Remove FF_CONST_AVUTIL55 cruft

Browse Source
This commit is contained in:
Hendrik Leppkes
2015-09-05 17:56:28 +02:00
parent 2df52088ef
commit 545559e43d
3 changed files with 6 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
libavutil/opt.c
View File

@@ -42,13 +42,13 @@
#include <float.h> #include <float.h>
#if FF_API_OLD_AVOPTIONS #if FF_API_OLD_AVOPTIONS
const AVOption *av_next_option(FF_CONST_AVUTIL55 void *obj, const AVOption *last) const AVOption *av_next_option(const void *obj, const AVOption *last)
{ {
return av_opt_next(obj, last); return av_opt_next(obj, last);
} }
#endif #endif
const AVOption *av_opt_next(FF_CONST_AVUTIL55 void *obj, const AVOption *last) const AVOption *av_opt_next(const void *obj, const AVOption *last)
{ {
const AVClass *class; const AVClass *class;
if (!obj) if (!obj)
@@ -1573,7 +1573,7 @@ static int opt_size(enum AVOptionType type)
return 0; return 0;
} }
int av_opt_copy(void *dst, FF_CONST_AVUTIL55 void *src) int av_opt_copy(void *dst, const void *src)
{ {
const AVOption *o = NULL; const AVOption *o = NULL;
const AVClass *c; const AVClass *c;

6
libavutil/opt.h
View File

@@ -420,7 +420,7 @@ AVRational av_get_q(void *obj, const char *name, const AVOption **o_out);
attribute_deprecated attribute_deprecated
int64_t av_get_int(void *obj, const char *name, const AVOption **o_out); int64_t av_get_int(void *obj, const char *name, const AVOption **o_out);
attribute_deprecated const char *av_get_string(void *obj, const char *name, const AVOption **o_out, char *buf, int buf_len); attribute_deprecated const char *av_get_string(void *obj, const char *name, const AVOption **o_out, char *buf, int buf_len);
attribute_deprecated const AVOption *av_next_option(FF_CONST_AVUTIL55 void *obj, const AVOption *last); attribute_deprecated const AVOption *av_next_option(const void *obj, const AVOption *last);
#endif #endif
/** /**
@@ -683,7 +683,7 @@ const AVOption *av_opt_find2(void *obj, const char *name, const char *unit,
* or NULL * or NULL
* @return next AVOption or NULL * @return next AVOption or NULL
*/ */
const AVOption *av_opt_next(FF_CONST_AVUTIL55 void *obj, const AVOption *prev); const AVOption *av_opt_next(const void *obj, const AVOption *prev);
/** /**
* Iterate over AVOptions-enabled children of obj. * Iterate over AVOptions-enabled children of obj.
@@ -835,7 +835,7 @@ int av_opt_query_ranges(AVOptionRanges **, void *obj, const char *key, int flags
* @param src Object to copy into * @param src Object to copy into
* @return 0 on success, negative on error * @return 0 on success, negative on error
*/ */
int av_opt_copy(void *dest, FF_CONST_AVUTIL55 void *src); int av_opt_copy(void *dest, const void *src);
/** /**
* Get a default list of allowed ranges for the given option. * Get a default list of allowed ranges for the given option.

8
libavutil/version.h
View File

@@ -115,14 +115,6 @@
#define FF_API_FRAME_QP (LIBAVUTIL_VERSION_MAJOR < 56) #define FF_API_FRAME_QP (LIBAVUTIL_VERSION_MAJOR < 56)
#endif #endif
#ifndef FF_CONST_AVUTIL55
#if LIBAVUTIL_VERSION_MAJOR >= 55
#define FF_CONST_AVUTIL55 const
#else
#define FF_CONST_AVUTIL55
#endif
#endif
/** /**
* @} * @}
*/ */