apps/ffmpeg-rockchip
1
0
Fork 0
mirror of https://github.com/nyanmisaka/ffmpeg-rockchip.git synced 2025-10-30 12:06:40 +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>
#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);
}
#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;
if (!obj)
@@ -1573,7 +1573,7 @@ static int opt_size(enum AVOptionType type)
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 AVClass *c;