Skip to content

M
mpd
Commit 47c50c07 authored by Max Kellermann's avatar Max Kellermann
Browse files
Options

decoder/ffmpeg: use IgnoreError instead of local Error instance

parent 3b0fea5f
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 5 deletions
src/decoder/FfmpegDecoderPlugin.cxx
View file @ 47c50c07
...@@ -120,8 +120,7 @@ mpd_ffmpeg_stream_seek(void *opaque, int64_t pos, int whence) ...@@ -120,8 +120,7 @@ mpd_ffmpeg_stream_seek(void *opaque, int64_t pos, int whence)
if (whence == AVSEEK_SIZE) if (whence == AVSEEK_SIZE)
return stream->input.size; return stream->input.size;
Error error; if (!stream->input.LockSeek(pos, whence, IgnoreError()))
if (!stream->input.LockSeek(pos, whence, error))
return -1; return -1;
return stream->input.offset; return stream->input.offset;
...@@ -342,11 +341,9 @@ ffmpeg_probe(Decoder *decoder, InputStream &is) ...@@ -342,11 +341,9 @@ ffmpeg_probe(Decoder *decoder, InputStream &is)
PADDING = 16, PADDING = 16,
}; };
Error error;
unsigned char buffer[BUFFER_SIZE]; unsigned char buffer[BUFFER_SIZE];
size_t nbytes = decoder_read(decoder, is, 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; return nullptr;
/* some ffmpeg parsers (e.g. ac3_parser.c) read a few bytes /* some ffmpeg parsers (e.g. ac3_parser.c) read a few bytes
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment