summaryrefslogtreecommitdiffstats
path: root/demux/demux_rawvideo.c
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2013-07-11 20:08:12 +0200
committerwm4 <wm4@nowhere>2013-07-11 21:09:39 +0200
commitd17d2fdc7c536821b3fea8c4a37c0ad09fc487db (patch)
tree88e2dcaa89ea98478bd7831a87febb4c8ba7435c /demux/demux_rawvideo.c
parent3a7fa5b186fc130c159b072cb86194644f9876fb (diff)
downloadmpv-d17d2fdc7c536821b3fea8c4a37c0ad09fc487db.tar.bz2
mpv-d17d2fdc7c536821b3fea8c4a37c0ad09fc487db.tar.xz
demux: change signature of open functions, cleanups
Preparation for redoing the open functions.
Diffstat (limited to 'demux/demux_rawvideo.c')
-rw-r--r--demux/demux_rawvideo.c30
1 files changed, 13 insertions, 17 deletions
diff --git a/demux/demux_rawvideo.c b/demux/demux_rawvideo.c
index 4340362192..488c13bdec 100644
--- a/demux/demux_rawvideo.c
+++ b/demux/demux_rawvideo.c
@@ -56,13 +56,13 @@ const m_option_t demux_rawvideo_opts[] = {
};
-static demuxer_t* demux_rawvideo_open(demuxer_t* demuxer) {
+static int demux_rawvideo_open(demuxer_t* demuxer) {
struct sh_stream *sh;
sh_video_t* sh_video;
if(!width || !height){
mp_msg(MSGT_DEMUX,MSGL_ERR,"rawvideo: width or height not specified!\n");
- return 0;
+ return -1;
}
const char *decoder = "rawvideo";
@@ -109,7 +109,7 @@ static demuxer_t* demux_rawvideo_open(demuxer_t* demuxer) {
}
if (!bpp) {
mp_msg(MSGT_DEMUX,MSGL_ERR,"rawvideo: img size not specified and unknown format!\n");
- return 0;
+ return -1;
}
imgsize = width * height * bpp / 8;
}
@@ -126,7 +126,7 @@ static demuxer_t* demux_rawvideo_open(demuxer_t* demuxer) {
demuxer->movi_start = demuxer->stream->start_pos;
demuxer->movi_end = demuxer->stream->end_pos;
- return demuxer;
+ return 0;
}
static int demux_rawvideo_fill_buffer(demuxer_t* demuxer)
@@ -166,17 +166,13 @@ static void demux_rawvideo_seek(demuxer_t *demuxer,float rel_seek_secs,float aud
const demuxer_desc_t demuxer_desc_rawvideo = {
- "Raw video demuxer",
- "rawvideo",
- "rawvideo",
- "?",
- "",
- DEMUXER_TYPE_RAWVIDEO,
- 0, // no autodetect
- NULL,
- demux_rawvideo_fill_buffer,
- demux_rawvideo_open,
- NULL,
- demux_rawvideo_seek,
- NULL
+ .info = "Raw video demuxer",
+ .name = "rawvideo",
+ .shortdesc = "rawvideo",
+ .author = "?",
+ .comment = "",
+ .type = DEMUXER_TYPE_RAWVIDEO,
+ .fill_buffer = demux_rawvideo_fill_buffer,
+ .open = demux_rawvideo_open,
+ .seek = demux_rawvideo_seek,
};