Skip to content

F
ffmpeg
Commit 32e18dbf authored by James Almer's avatar James Almer
Browse files
Options

Revert efb79cab and 75bd2157 

ffserver usage of rc_eq was fixed.
Signed-off-by: 's avatarJames Almer <jamrial@gmail.com>
parent d4d2e9fe
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
libavcodec/version.h
View file @ 32e18dbf
...@@ -160,8 +160,8 @@ ...@@ -160,8 +160,8 @@
#ifndef FF_API_AVCTX_TIMEBASE #ifndef FF_API_AVCTX_TIMEBASE
#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 /* To be removed with ffserver removal */ #ifndef FF_API_MPV_OPT
#define FF_API_MPV_OPT 1 #define FF_API_MPV_OPT (LIBAVCODEC_VERSION_MAJOR < 58)
#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)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment