diff options
author | wm4 <wm4@nowhere> | 2013-06-25 00:43:04 +0200 |
---|---|---|
committer | wm4 <wm4@nowhere> | 2013-06-25 00:43:04 +0200 |
commit | 403a266d466850621397c07e0b96cc2c493b2936 (patch) | |
tree | 0835a0908b3df8cca8374d173c34e0bf7df7d842 /demux/demux_edl.c | |
parent | 536871d7e5848eb385b97202a33b9382b5e8ab0e (diff) | |
parent | 54851d60614e912fc422658302d72811a31b80f8 (diff) | |
download | mpv-403a266d466850621397c07e0b96cc2c493b2936.tar.bz2 mpv-403a266d466850621397c07e0b96cc2c493b2936.tar.xz |
Merge branch 'sub_mess2'
...the return.
Diffstat (limited to 'demux/demux_edl.c')
-rw-r--r-- | demux/demux_edl.c | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/demux/demux_edl.c b/demux/demux_edl.c index 1e1db5be93..c35137ffb2 100644 --- a/demux/demux_edl.c +++ b/demux/demux_edl.c @@ -34,17 +34,12 @@ static int try_open_file(struct demuxer *demuxer) if (strncmp(buf, header, len)) return 0; stream_seek(s, 0); - demuxer->file_contents = stream_read_complete(s, demuxer, 1000000, 0); + demuxer->file_contents = stream_read_complete(s, demuxer, 1000000); if (demuxer->file_contents.start == NULL) return 0; 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, }; |