Merge commit '6d3ea1957f681b3bf9c752e6d21a501cc8d4180d'

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

Conflicts:
	libavfilter/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>

diff --cc doc/APIchanges
index 9153d9a,944d214..d0c4e69
--- 1/doc/APIchanges
--- 2/doc/APIchanges
+++ b/doc/APIchanges
@@@ -4,11 -4,9 +4,11 @@@ since the last major version increase o
  The last version increases were:
  libavcodec:    2013-03-xx
  libavdevice:   2013-03-xx
- libavfilter:   2012-06-22
+ libavfilter:   2013-12-xx
  libavformat:   2013-03-xx
  libavresample: 2012-10-05
 +libpostproc:   2011-04-18
 +libswresample: 2011-09-19
  libswscale:    2011-06-20
  libavutil:     2013-12-xx
  

diff --cc libavfilter/version.h
index 9cc7e3c,9f00ffe..0427760
--- 1/libavfilter/version.h
--- 2/libavfilter/version.h
+++ b/libavfilter/version.h
@@@ -29,9 -29,9 +29,9 @@@
  
  #include "libavutil/avutil.h"
  
- #define LIBAVFILTER_VERSION_MAJOR  3
- #define LIBAVFILTER_VERSION_MINOR  92
 -#define LIBAVFILTER_VERSION_MAJOR  4
 -#define LIBAVFILTER_VERSION_MINOR  0
 -#define LIBAVFILTER_VERSION_MICRO  0
++#define LIBAVFILTER_VERSION_MAJOR   4
++#define LIBAVFILTER_VERSION_MINOR   0
 +#define LIBAVFILTER_VERSION_MICRO 100
  
  #define LIBAVFILTER_VERSION_INT AV_VERSION_INT(LIBAVFILTER_VERSION_MAJOR, \
                                                 LIBAVFILTER_VERSION_MINOR, \
@@@ -50,43 -48,28 +50,43 @@@
   */
  
  #ifndef FF_API_AVFILTERPAD_PUBLIC
- #define FF_API_AVFILTERPAD_PUBLIC           (LIBAVFILTER_VERSION_MAJOR < 4)
+ #define FF_API_AVFILTERPAD_PUBLIC           (LIBAVFILTER_VERSION_MAJOR < 5)
  #endif
  #ifndef FF_API_FOO_COUNT
- #define FF_API_FOO_COUNT                    (LIBAVFILTER_VERSION_MAJOR < 4)
+ #define FF_API_FOO_COUNT                    (LIBAVFILTER_VERSION_MAJOR < 5)
  #endif
- #define FF_API_FILL_FRAME                   (LIBAVFILTER_VERSION_MAJOR < 4)
 +#ifndef FF_API_FILL_FRAME
- #define FF_API_BUFFERSRC_BUFFER             (LIBAVFILTER_VERSION_MAJOR < 4)
++#define FF_API_FILL_FRAME                   (LIBAVFILTER_VERSION_MAJOR < 5)
 +#endif
 +#ifndef FF_API_BUFFERSRC_BUFFER
++#define FF_API_BUFFERSRC_BUFFER             (LIBAVFILTER_VERSION_MAJOR < 5)
 +#endif
  #ifndef FF_API_AVFILTERBUFFER
- #define FF_API_AVFILTERBUFFER               (LIBAVFILTER_VERSION_MAJOR < 4)
+ #define FF_API_AVFILTERBUFFER               (LIBAVFILTER_VERSION_MAJOR < 5)
  #endif
  #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
- #define FF_API_ACONVERT_FILTER              (LIBAVFILTER_VERSION_MAJOR < 4)
 +#ifndef FF_API_ACONVERT_FILTER
++#define FF_API_ACONVERT_FILTER              (LIBAVFILTER_VERSION_MAJOR < 5)
 +#endif
  #ifndef FF_API_AVFILTER_OPEN
- #define FF_API_AVFILTER_OPEN                (LIBAVFILTER_VERSION_MAJOR < 4)
+ #define FF_API_AVFILTER_OPEN                (LIBAVFILTER_VERSION_MAJOR < 5)
  #endif
  #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
  #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
- #define FF_API_OLD_GRAPH_PARSE              (LIBAVFILTER_VERSION_MAJOR < 4)
 +#ifndef FF_API_OLD_GRAPH_PARSE
- #define FF_API_DRAWTEXT_OLD_TIMELINE        (LIBAVFILTER_VERSION_MAJOR < 4)
++#define FF_API_OLD_GRAPH_PARSE              (LIBAVFILTER_VERSION_MAJOR < 5)
 +#endif
 +#ifndef FF_API_DRAWTEXT_OLD_TIMELINE
++#define FF_API_DRAWTEXT_OLD_TIMELINE        (LIBAVFILTER_VERSION_MAJOR < 5)
 +#endif
  #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 /* AVFILTER_VERSION_H */