diff options
| author | James Almer <jamrial@gmail.com> | 2017-10-21 17:55:08 -0300 |
|---|---|---|
| committer | James Almer <jamrial@gmail.com> | 2017-10-21 22:10:24 -0300 |
| commit | 32e18dbfe8e4a0781c09e96512c302019de7f69f (patch) | |
| tree | 9d36c88258e20b37f308f3c17b28d6b2ecaf76b9 | |
| parent | d4d2e9fe4e1e93d37fd543092e45041f58fa8c00 (diff) | |
| download | ffmpeg-32e18dbfe8e4a0781c09e96512c302019de7f69f.tar.gz | |
Revert efb79cabb2 and 75bd215727
ffserver usage of rc_eq was fixed.
Signed-off-by: James Almer <jamrial@gmail.com>
| -rw-r--r-- | libavcodec/version.h | 4 |
1 files 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) |