Merge tag 'v0.19.19'

release v0.19.19
2016-08-23 10:27:39 +02:00
parent e2f6cc9c9f d4db873716
commit d0dae177cf
4 changed files with 19 additions and 8 deletions
--- a/src/decoder/plugins/FfmpegDecoderPlugin.cxx
+++ b/src/decoder/plugins/FfmpegDecoderPlugin.cxx
@@ -653,6 +653,10 @@ FfmpegDecode(Decoder &decoder, InputStream &input,
 	AtScopeExit(&codec_context) {
 		avcodec_free_context(&codec_context);
 	};
+
+#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(57, 25, 0) /* FFmpeg 3.1 */
+	avcodec_parameters_to_context(codec_context, av_stream.codecpar);
+#endif
 #endif

 	const SampleFormat sample_format =