summaryrefslogtreecommitdiffstats
path: root/demux/demux.h
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.h
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.h')
-rw-r--r--demux/demux.h16
1 files changed, 6 insertions, 10 deletions
diff --git a/demux/demux.h b/demux/demux.h
index 3b0d6d5956..c43f0282fb 100644
--- a/demux/demux.h
+++ b/demux/demux.h
@@ -105,19 +105,15 @@ typedef struct demuxer_desc {
// If 1 detection is safe and fast, do it before file extension check
int safe_check;
- // Check if can demux the file, return DEMUXER_TYPE_xxx on success
- // Mandatory if safe_check == 1, else optional
+ // Return 0 on success, otherwise -1
int (*check_file)(struct demuxer *demuxer);
- /// Get packets from file, return 0 on eof. Mandatory
- int (*fill_buffer)(struct demuxer *demuxer);
- /// Open the demuxer, return demuxer on success, NULL on failure
- struct demuxer *(*open)(struct demuxer *demuxer); // Optional
- /// Close the demuxer
- void (*close)(struct demuxer *demuxer); // Optional
- // Seek. Optional
+ // Open the demuxer, return 0 on success, otherwise -1
+ int (*open)(struct demuxer *demuxer);
+ // The following functions are all optional
+ int (*fill_buffer)(struct demuxer *demuxer); // 0 on EOF, otherwise 1
+ void (*close)(struct demuxer *demuxer);
void (*seek)(struct demuxer *demuxer, float rel_seek_secs,
float audio_delay, int flags);
- // Various control functions. Optional
int (*control)(struct demuxer *demuxer, int cmd, void *arg);
} demuxer_desc_t;