Merge branch 'v0.20.x'

This commit is contained in:
Max Kellermann
2017-11-12 18:55:12 +01:00
4 changed files with 8 additions and 2 deletions

View File

@@ -258,7 +258,7 @@ FfmpegSendFrame(DecoderClient &client, InputStream &is,
try {
output_buffer = copy_interleave_frame(codec_context, frame,
buffer);
} catch (const std::exception e) {
} catch (const std::exception &e) {
/* this must be a serious error, e.g. OOM */
LogError(e);
return DecoderCommand::STOP;