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

input/ffmpeg: use av_strerror()

Browse Source 
Generate more detailed error messages.
This commit is contained in:
Max Kellermann
2014-08-18 20:20:51 +02:00
parent 636f5d4a1d
commit e6e9c21275
5 changed files with 80 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/input/plugins/FfmpegInputPlugin.cxx
View File

@@ -23,6 +23,7 @@
#include "config.h"
#include "FfmpegInputPlugin.hxx"
#include "lib/ffmpeg/Domain.hxx"
#include "lib/ffmpeg/Error.hxx"
#include "../InputStream.hxx"
#include "../InputPlugin.hxx"
#include "util/StringUtil.hxx"
@@ -101,8 +102,7 @@ input_ffmpeg_open(const char *uri,
AVIOContext *h;
auto result = avio_open(&h, uri, AVIO_FLAG_READ);
if (result != 0) {
error.Set(ffmpeg_domain, result,
"libavformat failed to open the URI");
SetFfmpegError(error, result);
return nullptr;
}
@@ -115,7 +115,7 @@ FfmpegInputStream::Read(void *ptr, size_t read_size, Error &error)
auto result = avio_read(h, (unsigned char *)ptr, read_size);
if (result <= 0) {
if (result < 0)
error.Set(ffmpeg_domain, "avio_read() failed");
SetFfmpegError(error, result, "avio_read() failed");
eof = true;
return false;
@@ -137,7 +137,7 @@ FfmpegInputStream::Seek(offset_type new_offset, Error &error)
auto result = avio_seek(h, new_offset, SEEK_SET);
if (result < 0) {
error.Set(ffmpeg_domain, "avio_seek() failed");
SetFfmpegError(error, result, "avio_seek() failed");
return false;
}