mirror of
https://git.ffmpeg.org/ffmpeg.git
synced 2025-01-19 13:50:58 +00:00
Merge commit '2f9b652e8c646eabef74a6742f0d7d4c9118fd0e'
* commit '2f9b652e8c646eabef74a6742f0d7d4c9118fd0e': lavu: Drop deprecated context size variables These variables had been previously un-deprecated in ffmpeg, not removed. Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
This commit is contained in:
commit
f940931995
@ -87,9 +87,6 @@
|
|||||||
#ifndef FF_API_OLD_AVOPTIONS
|
#ifndef FF_API_OLD_AVOPTIONS
|
||||||
#define FF_API_OLD_AVOPTIONS (LIBAVUTIL_VERSION_MAJOR < 55)
|
#define FF_API_OLD_AVOPTIONS (LIBAVUTIL_VERSION_MAJOR < 55)
|
||||||
#endif
|
#endif
|
||||||
#ifndef FF_API_CONTEXT_SIZE
|
|
||||||
#define FF_API_CONTEXT_SIZE (LIBAVUTIL_VERSION_MAJOR < 55)
|
|
||||||
#endif
|
|
||||||
#ifndef FF_API_LLS_PRIVATE
|
#ifndef FF_API_LLS_PRIVATE
|
||||||
#define FF_API_LLS_PRIVATE (LIBAVUTIL_VERSION_MAJOR < 55)
|
#define FF_API_LLS_PRIVATE (LIBAVUTIL_VERSION_MAJOR < 55)
|
||||||
#endif
|
#endif
|
||||||
|
Loading…
Reference in New Issue
Block a user