Merge tag 'v0.19.18'

release v0.19.18
This commit is contained in:
Max Kellermann
2016-08-05 18:51:38 +02:00
4 changed files with 20 additions and 2 deletions

View File

@@ -88,7 +88,7 @@ ffmpeg_init(gcc_unused const ConfigBlock &block)
return true;
}
#if LIBAVFORMAT_VERSION_INT >= AV_VERSION_INT(57, 5, 0)
#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(57, 25, 0) /* FFmpeg 3.1 */
gcc_pure
static const AVCodecParameters &