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

input/ffmpeg: rename the class

Browse Source
This commit is contained in:
Max Kellermann
2013-01-28 21:45:44 +01:00
parent 0dd4b52b63
commit 00f8c2d46f
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/input/FfmpegInputPlugin.cxx
View File

@@ -35,7 +35,7 @@ extern "C" {
#undef G_LOG_DOMAIN #undef G_LOG_DOMAIN
#define G_LOG_DOMAIN "input_ffmpeg" #define G_LOG_DOMAIN "input_ffmpeg"
struct input_ffmpeg { struct FfmpegInputStream {
struct input_stream base; struct input_stream base;
AVIOContext *h; AVIOContext *h;
@@ -77,7 +77,7 @@ input_ffmpeg_open(const char *uri,
Mutex &mutex, Cond &cond, Mutex &mutex, Cond &cond,
GError **error_r) GError **error_r)
{ {
struct input_ffmpeg *i; FfmpegInputStream *i;
if (!g_str_has_prefix(uri, "gopher://") && if (!g_str_has_prefix(uri, "gopher://") &&
!g_str_has_prefix(uri, "rtp://") && !g_str_has_prefix(uri, "rtp://") &&
@@ -87,7 +87,7 @@ input_ffmpeg_open(const char *uri,
!g_str_has_prefix(uri, "rtmps://")) !g_str_has_prefix(uri, "rtmps://"))
return nullptr; return nullptr;
i = g_new(struct input_ffmpeg, 1); i = g_new(FfmpegInputStream, 1);
input_stream_init(&i->base, &input_plugin_ffmpeg, uri, input_stream_init(&i->base, &input_plugin_ffmpeg, uri,
mutex, cond); mutex, cond);
@@ -118,7 +118,7 @@ static size_t
input_ffmpeg_read(struct input_stream *is, void *ptr, size_t size, input_ffmpeg_read(struct input_stream *is, void *ptr, size_t size,
GError **error_r) GError **error_r)
{ {
struct input_ffmpeg *i = (struct input_ffmpeg *)is; FfmpegInputStream *i = (FfmpegInputStream *)is;
int ret = avio_read(i->h, (unsigned char *)ptr, size); int ret = avio_read(i->h, (unsigned char *)ptr, size);
if (ret <= 0) { if (ret <= 0) {
@@ -137,7 +137,7 @@ input_ffmpeg_read(struct input_stream *is, void *ptr, size_t size,
static void static void
input_ffmpeg_close(struct input_stream *is) input_ffmpeg_close(struct input_stream *is)
{ {
struct input_ffmpeg *i = (struct input_ffmpeg *)is; FfmpegInputStream *i = (FfmpegInputStream *)is;
avio_close(i->h); avio_close(i->h);
input_stream_deinit(&i->base); input_stream_deinit(&i->base);
@@ -147,7 +147,7 @@ input_ffmpeg_close(struct input_stream *is)
static bool static bool
input_ffmpeg_eof(struct input_stream *is) input_ffmpeg_eof(struct input_stream *is)
{ {
struct input_ffmpeg *i = (struct input_ffmpeg *)is; FfmpegInputStream *i = (FfmpegInputStream *)is;
return i->eof; return i->eof;
} }
@@ -156,7 +156,7 @@ static bool
input_ffmpeg_seek(struct input_stream *is, goffset offset, int whence, input_ffmpeg_seek(struct input_stream *is, goffset offset, int whence,
G_GNUC_UNUSED GError **error_r) G_GNUC_UNUSED GError **error_r)
{ {
struct input_ffmpeg *i = (struct input_ffmpeg *)is; FfmpegInputStream *i = (FfmpegInputStream *)is;
int64_t ret = avio_seek(i->h, offset, whence); int64_t ret = avio_seek(i->h, offset, whence);
if (ret >= 0) { if (ret >= 0) {