highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

avcodec/version: re-enable FF_API_MPV_OPT until the open ABI period is over

Browse Source 
ffserver depends on it, so keep it in place until the two can be
removed together.
This commit is contained in:
James Almer
2017-10-21 16:26:07 -03:00
parent c060ed02a8
commit 75bd215727
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libavcodec/version.h
View File

@@ -161,7 +161,7 @@
#define FF_API_AVCTX_TIMEBASE (LIBAVCODEC_VERSION_MAJOR < 59) #define FF_API_AVCTX_TIMEBASE (LIBAVCODEC_VERSION_MAJOR < 59)
#endif #endif
#ifndef FF_API_MPV_OPT #ifndef FF_API_MPV_OPT
#define FF_API_MPV_OPT (LIBAVCODEC_VERSION_MAJOR < 58) #define FF_API_MPV_OPT (LIBAVCODEC_VERSION_MAJOR < 59)
#endif #endif
#ifndef FF_API_STREAM_CODEC_TAG #ifndef FF_API_STREAM_CODEC_TAG
#define FF_API_STREAM_CODEC_TAG (LIBAVCODEC_VERSION_MAJOR < 58) #define FF_API_STREAM_CODEC_TAG (LIBAVCODEC_VERSION_MAJOR < 58)