Merge commit '3d89373fae281053154772d5e3e4370da09d3880'
authorHendrik Leppkes <h.leppkes@gmail.com>
Sat, 5 Sep 2015 15:46:47 +0000 (17:46 +0200)
committerHendrik Leppkes <h.leppkes@gmail.com>
Sat, 5 Sep 2015 15:46:47 +0000 (17:46 +0200)
* commit '3d89373fae281053154772d5e3e4370da09d3880':
  lavu: Drop deprecated private lls functions

Previously removed in ffmpeg

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
1  2 
libavutil/version.h

   * @{
   */
  
- #ifndef FF_API_LLS_PRIVATE
- #define FF_API_LLS_PRIVATE              (LIBAVUTIL_VERSION_MAJOR < 55)
- #endif
 +#ifndef FF_API_OLD_AVOPTIONS
 +#define FF_API_OLD_AVOPTIONS            (LIBAVUTIL_VERSION_MAJOR < 55)
 +#endif
  #ifndef FF_API_VDPAU
  #define FF_API_VDPAU                    (LIBAVUTIL_VERSION_MAJOR < 55)
  #endif