From d064c69e1c958514c3ef4d7871bcd92c8ff92de9 Mon Sep 17 00:00:00 2001 From: wm4 Date: Tue, 11 Jun 2013 12:07:04 +0200 Subject: demux: don't require fill_buffer callback --- demux/demux.c | 2 +- demux/demux_cue.c | 6 ------ demux/demux_edl.c | 6 ------ 3 files changed, 1 insertion(+), 13 deletions(-) diff --git a/demux/demux.c b/demux/demux.c index 5de6b84745..d9b41e2c99 100644 --- a/demux/demux.c +++ b/demux/demux.c @@ -599,7 +599,7 @@ static bool demux_check_queue_full(demuxer_t *demux) int demux_fill_buffer(demuxer_t *demux, demux_stream_t *ds) { // Note: parameter 'ds' can be NULL! - return demux->desc->fill_buffer(demux, ds); + return demux->desc->fill_buffer ? demux->desc->fill_buffer(demux, ds) : 0; } // return value: diff --git a/demux/demux_cue.c b/demux/demux_cue.c index 31a3e00e40..04cc3229f3 100644 --- a/demux/demux_cue.c +++ b/demux/demux_cue.c @@ -47,11 +47,6 @@ static int try_open_file(struct demuxer *demuxer) return DEMUXER_TYPE_CUE; } -static int dummy_fill_buffer(struct demuxer *demuxer, struct demux_stream *ds) -{ - return 0; -} - const struct demuxer_desc demuxer_desc_cue = { .info = "CUE file demuxer", .name = "cue", @@ -61,5 +56,4 @@ const struct demuxer_desc demuxer_desc_cue = { .type = DEMUXER_TYPE_CUE, .safe_check = true, .check_file = try_open_file, // no separate .open - .fill_buffer = dummy_fill_buffer, }; diff --git a/demux/demux_edl.c b/demux/demux_edl.c index 1e1db5be93..71d75e7f38 100644 --- a/demux/demux_edl.c +++ b/demux/demux_edl.c @@ -40,11 +40,6 @@ static int try_open_file(struct demuxer *demuxer) return DEMUXER_TYPE_EDL; } -static int dummy_fill_buffer(struct demuxer *demuxer, struct demux_stream *ds) -{ - return 0; -} - const struct demuxer_desc demuxer_desc_edl = { .info = "EDL file demuxer", .name = "edl", @@ -54,5 +49,4 @@ const struct demuxer_desc demuxer_desc_edl = { .type = DEMUXER_TYPE_EDL, .safe_check = true, .check_file = try_open_file, // no separate .open - .fill_buffer = dummy_fill_buffer, }; -- cgit v1.2.3