[FFmpeg-cvslog] Revert efb79cabb2 and 75bd215727

[James Almer]

ffmpeg | branch: master | James Almer <jamrial at gmail.com> | Sat Oct 21 17:55:08 2017 -0300| [32e18dbfe8e4a0781c09e96512c302019de7f69f] | committer: James Almer

Revert efb79cabb2 and 75bd215727

ffserver usage of rc_eq was fixed.

Signed-off-by: James Almer <jamrial at gmail.com>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=32e18dbfe8e4a0781c09e96512c302019de7f69f
---

 libavcodec/version.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/libavcodec/version.h b/libavcodec/version.h
index 8584bb7006..9f1543a6aa 100644
--- 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)