Revert efb79cabb2 and 75bd215727

[ffmpeg] / libavcodec / version.h

diff --git a/libavcodec/version.h b/libavcodec/version.h
index 8584bb7006ffa4e024b7e6560b5468782035a275..9f1543a6aa4c68846667d71d6de85a2814940a66 100644 (file)
--- 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)