diff options
| author | Max Kellermann <max@duempel.org> | 2012-01-05 00:33:23 +0100 |
|---|---|---|
| committer | Max Kellermann <max@duempel.org> | 2012-01-05 00:33:23 +0100 |
| commit | 9937ff8ac066f8bc0737bc9ff1e4744772647856 (patch) | |
| tree | 92834f6c13970c7c72dd77d30e332fa116f5cfcc /src/input | |
| parent | 95b2df8261c71be4325a9bc95f8ecf0af3bb3045 (diff) | |
| parent | abd1949825896bd38202eb17029ca93fb3863103 (diff) | |
| download | mpd-9937ff8ac066f8bc0737bc9ff1e4744772647856.tar.gz mpd-9937ff8ac066f8bc0737bc9ff1e4744772647856.tar.xz mpd-9937ff8ac066f8bc0737bc9ff1e4744772647856.zip | |
Merge branch 'v0.16.x'
Conflicts:
src/decoder/ffmpeg_decoder_plugin.c
src/input/ffmpeg_input_plugin.c
Diffstat (limited to '')
| -rw-r--r-- | src/input/ffmpeg_input_plugin.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/input/ffmpeg_input_plugin.c b/src/input/ffmpeg_input_plugin.c index 1c64b52c1..d71b3d4c0 100644 --- a/src/input/ffmpeg_input_plugin.c +++ b/src/input/ffmpeg_input_plugin.c @@ -28,6 +28,10 @@ #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; |