oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

Merge branch 'v0.18.x'

Browse Source
This commit is contained in:
Max Kellermann
2013-12-14 12:37:16 +01:00
parent d43aa12987 c170fed6f9
commit c7b1038a9d
12 changed files with 126 additions and 143 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/decoder/FfmpegDecoderPlugin.cxx
View File

@@ -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