Revert efb79cabb2 and 75bd215727

ffserver usage of rc_eq was fixed. Signed-off-by: James Almer <jamrial@gmail.com>
7 years ago · 32e18dbfe8
parent d4d2e9fe4e
commit 32e18dbfe8
1 changed files with 2 additions and 2 deletions
--- a/libavcodec/version.h
+++ b/libavcodec/version.h
@ -160,8 +160,8 @@
 #ifndef FF_API_AVCTX_TIMEBASE
 #define FF_API_AVCTX_TIMEBASE    (LIBAVCODEC_VERSION_MAJOR < 59)
 #endif
-#ifndef FF_API_MPV_OPT /* To be removed with ffserver removal */
-#define FF_API_MPV_OPT           1
+#ifndef FF_API_MPV_OPT
+#define FF_API_MPV_OPT           (LIBAVCODEC_VERSION_MAJOR < 58)
 #endif
 #ifndef FF_API_STREAM_CODEC_TAG
 #define FF_API_STREAM_CODEC_TAG  (LIBAVCODEC_VERSION_MAJOR < 58)