Merge branch 'v0.19.x'

2016-10-27 21:01:27 +02:00
parent 10e32454ef 49c04ccfc7
commit debc855806
7 changed files with 36 additions and 25 deletions
--- a/src/decoder/plugins/FfmpegDecoderPlugin.cxx
+++ b/src/decoder/plugins/FfmpegDecoderPlugin.cxx
@@ -757,7 +757,7 @@ FfmpegDecode(Decoder &decoder, InputStream &input,
 		FfmpegCheckTag(decoder, input, format_context, audio_stream);
 #endif

-		if (packet.stream_index == audio_stream) {
+		if (packet.size > 0 && packet.stream_index == audio_stream) {
 			cmd = ffmpeg_send_packet(decoder, input,
 						 packet,
 						 *codec_context,