generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge commit '6d3ea1957f681b3bf9c752e6d21a501cc8d4180d'

Browse Source 
* commit '6d3ea1957f681b3bf9c752e6d21a501cc8d4180d':
  Bump major of libavfilter for reference counted buffer API changes.

Conflicts:
	libavfilter/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2013-12-16 22:07:24 +01:00
commit a788949255
2 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
doc/APIchanges
View File

@ -4,7 +4,7 @@ since the last major version increase or the API was added.
The last version increases were: The last version increases were:
libavcodec: 2013-03-xx libavcodec: 2013-03-xx
libavdevice: 2013-03-xx libavdevice: 2013-03-xx
libavfilter: 2012-06-22 libavfilter: 2013-12-xx
libavformat: 2013-03-xx libavformat: 2013-03-xx
libavresample: 2012-10-05 libavresample: 2012-10-05
libpostproc: 2011-04-18 libpostproc: 2011-04-18

30
libavfilter/version.h
View File

@ -29,8 +29,8 @@
#include "libavutil/avutil.h" #include "libavutil/avutil.h"
#define LIBAVFILTER_VERSION_MAJOR 3 #define LIBAVFILTER_VERSION_MAJOR 4
#define LIBAVFILTER_VERSION_MINOR 92 #define LIBAVFILTER_VERSION_MINOR 0
#define LIBAVFILTER_VERSION_MICRO 100 #define LIBAVFILTER_VERSION_MICRO 100
#define LIBAVFILTER_VERSION_INT AV_VERSION_INT(LIBAVFILTER_VERSION_MAJOR, \ #define LIBAVFILTER_VERSION_INT AV_VERSION_INT(LIBAVFILTER_VERSION_MAJOR, \
@ -50,43 +50,43 @@
*/ */
#ifndef FF_API_AVFILTERPAD_PUBLIC #ifndef FF_API_AVFILTERPAD_PUBLIC
#define FF_API_AVFILTERPAD_PUBLIC (LIBAVFILTER_VERSION_MAJOR < 4) #define FF_API_AVFILTERPAD_PUBLIC (LIBAVFILTER_VERSION_MAJOR < 5)
#endif #endif
#ifndef FF_API_FOO_COUNT #ifndef FF_API_FOO_COUNT
#define FF_API_FOO_COUNT (LIBAVFILTER_VERSION_MAJOR < 4) #define FF_API_FOO_COUNT (LIBAVFILTER_VERSION_MAJOR < 5)
#endif #endif
#ifndef FF_API_FILL_FRAME #ifndef FF_API_FILL_FRAME
#define FF_API_FILL_FRAME (LIBAVFILTER_VERSION_MAJOR < 4) #define FF_API_FILL_FRAME (LIBAVFILTER_VERSION_MAJOR < 5)
#endif #endif
#ifndef FF_API_BUFFERSRC_BUFFER #ifndef FF_API_BUFFERSRC_BUFFER
#define FF_API_BUFFERSRC_BUFFER (LIBAVFILTER_VERSION_MAJOR < 4) #define FF_API_BUFFERSRC_BUFFER (LIBAVFILTER_VERSION_MAJOR < 5)
#endif #endif
#ifndef FF_API_AVFILTERBUFFER #ifndef FF_API_AVFILTERBUFFER
#define FF_API_AVFILTERBUFFER (LIBAVFILTER_VERSION_MAJOR < 4) #define FF_API_AVFILTERBUFFER (LIBAVFILTER_VERSION_MAJOR < 5)
#endif #endif
#ifndef FF_API_OLD_FILTER_OPTS #ifndef FF_API_OLD_FILTER_OPTS
#define FF_API_OLD_FILTER_OPTS (LIBAVFILTER_VERSION_MAJOR < 4) #define FF_API_OLD_FILTER_OPTS (LIBAVFILTER_VERSION_MAJOR < 5)
#endif #endif
#ifndef FF_API_ACONVERT_FILTER #ifndef FF_API_ACONVERT_FILTER
#define FF_API_ACONVERT_FILTER (LIBAVFILTER_VERSION_MAJOR < 4) #define FF_API_ACONVERT_FILTER (LIBAVFILTER_VERSION_MAJOR < 5)
#endif #endif
#ifndef FF_API_AVFILTER_OPEN #ifndef FF_API_AVFILTER_OPEN
#define FF_API_AVFILTER_OPEN (LIBAVFILTER_VERSION_MAJOR < 4) #define FF_API_AVFILTER_OPEN (LIBAVFILTER_VERSION_MAJOR < 5)
#endif #endif
#ifndef FF_API_AVFILTER_INIT_FILTER #ifndef FF_API_AVFILTER_INIT_FILTER
#define FF_API_AVFILTER_INIT_FILTER (LIBAVFILTER_VERSION_MAJOR < 4) #define FF_API_AVFILTER_INIT_FILTER (LIBAVFILTER_VERSION_MAJOR < 5)
#endif #endif
#ifndef FF_API_OLD_FILTER_REGISTER #ifndef FF_API_OLD_FILTER_REGISTER
#define FF_API_OLD_FILTER_REGISTER (LIBAVFILTER_VERSION_MAJOR < 4) #define FF_API_OLD_FILTER_REGISTER (LIBAVFILTER_VERSION_MAJOR < 5)
#endif #endif
#ifndef FF_API_OLD_GRAPH_PARSE #ifndef FF_API_OLD_GRAPH_PARSE
#define FF_API_OLD_GRAPH_PARSE (LIBAVFILTER_VERSION_MAJOR < 4) #define FF_API_OLD_GRAPH_PARSE (LIBAVFILTER_VERSION_MAJOR < 5)
#endif #endif
#ifndef FF_API_DRAWTEXT_OLD_TIMELINE #ifndef FF_API_DRAWTEXT_OLD_TIMELINE
#define FF_API_DRAWTEXT_OLD_TIMELINE (LIBAVFILTER_VERSION_MAJOR < 4) #define FF_API_DRAWTEXT_OLD_TIMELINE (LIBAVFILTER_VERSION_MAJOR < 5)
#endif #endif
#ifndef FF_API_NOCONST_GET_NAME #ifndef FF_API_NOCONST_GET_NAME
#define FF_API_NOCONST_GET_NAME (LIBAVFILTER_VERSION_MAJOR < 4) #define FF_API_NOCONST_GET_NAME (LIBAVFILTER_VERSION_MAJOR < 5)
#endif #endif
#endif /* AVFILTER_VERSION_H */ #endif /* AVFILTER_VERSION_H */