Merge commit '8e18328b18e69b38a5feae5d10ad01b403a205b6'
authorJames Almer <jamrial@gmail.com>
Sat, 21 Oct 2017 18:37:34 +0000 (15:37 -0300)
committerJames Almer <jamrial@gmail.com>
Sat, 21 Oct 2017 18:37:34 +0000 (15:37 -0300)
* commit '8e18328b18e69b38a5feae5d10ad01b403a205b6':
  lavfi: Drop deprecated filter registration

Merged-by: James Almer <jamrial@gmail.com>
1  2 
libavfilter/avfilter.c
libavfilter/avfilter.h
libavfilter/version.h

Simple merge
Simple merge
   * the public API and may change, break or disappear at any time.
   */
  
- #ifndef FF_API_OLD_FILTER_REGISTER
- #define FF_API_OLD_FILTER_REGISTER          (LIBAVFILTER_VERSION_MAJOR < 7)
- #endif
 +#ifndef FF_API_OLD_FILTER_OPTS_ERROR
 +#define FF_API_OLD_FILTER_OPTS_ERROR        (LIBAVFILTER_VERSION_MAJOR < 8)
 +#endif
  #ifndef FF_API_NOCONST_GET_NAME
  #define FF_API_NOCONST_GET_NAME             (LIBAVFILTER_VERSION_MAJOR < 7)
  #endif