Merge branch 'v0.20.x'

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

1
NEWS
View File

@ -19,6 +19,7 @@ ver 0.20.12 (not yet released)
* input * input
- curl: fix seeking - curl: fix seeking
* decoder * decoder
- ffmpeg: fix GCC 8 warning
- vorbis: fix Tremor support - vorbis: fix Tremor support
* player * player
- log message when decoder is too slow - log message when decoder is too slow

View File

@ -1400,6 +1400,11 @@ then
AX_APPEND_COMPILE_FLAGS([-Wcast-qual]) AX_APPEND_COMPILE_FLAGS([-Wcast-qual])
AX_APPEND_COMPILE_FLAGS([-Wwrite-strings]) AX_APPEND_COMPILE_FLAGS([-Wwrite-strings])
AX_APPEND_COMPILE_FLAGS([-Wsign-compare]) AX_APPEND_COMPILE_FLAGS([-Wsign-compare])
dnl This GCC8 warning for C++17 ABI compatibility is of no
dnl interest for us, because we're not a shared library.
AX_APPEND_COMPILE_FLAGS([-Wno-noexcept-type])
AC_LANG_POP AC_LANG_POP
fi fi

View File

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

View File

@ -37,7 +37,7 @@ ArgParserTest::TestRange()
try { try {
range = ParseCommandArgRange("-2"); range = ParseCommandArgRange("-2");
CPPUNIT_ASSERT(false); CPPUNIT_ASSERT(false);
} catch (ProtocolError) { } catch (const ProtocolError &) {
CPPUNIT_ASSERT(true); CPPUNIT_ASSERT(true);
} }
} }