diff options
| author | Anton Khirnov <anton@khirnov.net> | 2011-03-31 12:55:18 +0200 |
|---|---|---|
| committer | Max Kellermann <max@duempel.org> | 2011-04-12 08:14:14 +0200 |
| commit | 9d91aa23e6b91c50059f03710cd5cedf3328da8e (patch) | |
| tree | da0debb2fb52b67876053f30b9ed6f2e2999b087 /src/input/ffmpeg_input_plugin.c | |
| parent | c2ada39fd3037a0f6180326ecb5fa5913b719326 (diff) | |
| download | mpd-9d91aa23e6b91c50059f03710cd5cedf3328da8e.tar.gz mpd-9d91aa23e6b91c50059f03710cd5cedf3328da8e.tar.xz mpd-9d91aa23e6b91c50059f03710cd5cedf3328da8e.zip | |
decoder/ffmpeg: drop support for pre-0.5 ffmpeg
All modern distros ship 0.5, so there's no need to support old and buggy
ffmpeg versions.
Diffstat (limited to 'src/input/ffmpeg_input_plugin.c')
| -rw-r--r-- | src/input/ffmpeg_input_plugin.c | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/src/input/ffmpeg_input_plugin.c b/src/input/ffmpeg_input_plugin.c index b6f8d814a..de201e9cc 100644 --- a/src/input/ffmpeg_input_plugin.c +++ b/src/input/ffmpeg_input_plugin.c @@ -21,13 +21,8 @@ #include "input/ffmpeg_input_plugin.h" #include "input_plugin.h" -#ifdef OLD_FFMPEG_INCLUDES -#include <avio.h> -#include <avformat.h> -#else #include <libavformat/avio.h> #include <libavformat/avformat.h> -#endif #undef G_LOG_DOMAIN #define G_LOG_DOMAIN "input_ffmpeg" @@ -52,14 +47,12 @@ input_ffmpeg_init(G_GNUC_UNUSED const struct config_param *param, { av_register_all(); -#if LIBAVFORMAT_VERSION_MAJOR >= 52 /* disable this plugin if there's no registered protocol */ if (av_protocol_next(NULL) == NULL) { g_set_error(error_r, ffmpeg_quark(), 0, "No protocol"); return false; } -#endif return true; } |