diff options
| author | Max Kellermann <max@duempel.org> | 2013-12-14 12:37:16 +0100 |
|---|---|---|
| committer | Max Kellermann <max@duempel.org> | 2013-12-14 12:37:16 +0100 |
| commit | c7b1038a9de21d73a229ff68b58daa1824bfd643 (patch) | |
| tree | c70ca2e91daf69ca23bb82d80341302731be98a1 /src/decoder | |
| parent | d43aa1298728f856d3d3a29477a91b79633022fe (diff) | |
| parent | c170fed6f9a747bfe9e4e53a85ebc2e92a70bab6 (diff) | |
| download | mpd-c7b1038a9de21d73a229ff68b58daa1824bfd643.tar.gz mpd-c7b1038a9de21d73a229ff68b58daa1824bfd643.tar.xz mpd-c7b1038a9de21d73a229ff68b58daa1824bfd643.zip | |
Merge branch 'v0.18.x'
Diffstat (limited to 'src/decoder')
| -rw-r--r-- | src/decoder/FfmpegDecoderPlugin.cxx | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/src/decoder/FfmpegDecoderPlugin.cxx b/src/decoder/FfmpegDecoderPlugin.cxx index bef74e367..a14b04510 100644 --- a/src/decoder/FfmpegDecoderPlugin.cxx +++ b/src/decoder/FfmpegDecoderPlugin.cxx @@ -119,8 +119,7 @@ mpd_ffmpeg_stream_seek(void *opaque, int64_t pos, int whence) if (whence == AVSEEK_SIZE) return stream->input.size; - Error error; - if (!stream->input.LockSeek(pos, whence, error)) + if (!stream->input.LockSeek(pos, whence, IgnoreError())) return -1; return stream->input.offset; @@ -341,11 +340,9 @@ ffmpeg_probe(Decoder *decoder, InputStream &is) PADDING = 16, }; - Error error; - unsigned char buffer[BUFFER_SIZE]; size_t nbytes = decoder_read(decoder, is, buffer, BUFFER_SIZE); - if (nbytes <= PADDING || !is.LockRewind(error)) + if (nbytes <= PADDING || !is.LockRewind(IgnoreError())) return nullptr; /* some ffmpeg parsers (e.g. ac3_parser.c) read a few bytes |