diff options
| author | Max Kellermann <max@duempel.org> | 2012-08-14 23:58:54 +0200 |
|---|---|---|
| committer | Max Kellermann <max@duempel.org> | 2012-08-14 23:58:54 +0200 |
| commit | 7d27d2ea5e8b622a288c80518bc0daec53dbbc93 (patch) | |
| tree | b1b9e98369919d66869b3ff1626372bf16a38c23 /src/input | |
| parent | 5cc3338267214eb050e39bc509d8b4258cec6afd (diff) | |
| parent | dc22846d58264bfae3b4516e2de1614b3b97a5ca (diff) | |
| download | mpd-7d27d2ea5e8b622a288c80518bc0daec53dbbc93.tar.gz mpd-7d27d2ea5e8b622a288c80518bc0daec53dbbc93.tar.xz mpd-7d27d2ea5e8b622a288c80518bc0daec53dbbc93.zip | |
Merge branch 'v0.17.x'
Diffstat (limited to '')
| -rw-r--r-- | src/input/ffmpeg_input_plugin.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/src/input/ffmpeg_input_plugin.c b/src/input/ffmpeg_input_plugin.c index d71b3d4c0..6d339a067 100644 --- a/src/input/ffmpeg_input_plugin.c +++ b/src/input/ffmpeg_input_plugin.c @@ -22,16 +22,13 @@ #include "input_internal.h" #include "input_plugin.h" +#include <libavutil/avutil.h> #include <libavformat/avio.h> #include <libavformat/avformat.h> #undef G_LOG_DOMAIN #define G_LOG_DOMAIN "input_ffmpeg" -#ifndef AV_VERSION_INT -#define AV_VERSION_INT(a, b, c) (a<<16 | b<<8 | c) -#endif - struct input_ffmpeg { struct input_stream base; |