diff options
Diffstat (limited to 'demux/demux_edl.c')
| -rw-r--r-- | demux/demux_edl.c | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/demux/demux_edl.c b/demux/demux_edl.c index c35137ffb2..5c6afa2d9b 100644 --- a/demux/demux_edl.c +++ b/demux/demux_edl.c @@ -1,6 +1,8 @@ /* * This file is part of MPlayer. * + * Original author: Uoti Urpala + * * MPlayer is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or @@ -23,30 +25,28 @@ #include "demux.h" #include "stream/stream.h" -static int try_open_file(struct demuxer *demuxer) +static int try_open_file(struct demuxer *demuxer, enum demux_check check) { struct stream *s = demuxer->stream; - const char header[] = "mplayer EDL file"; - const int len = sizeof(header) - 1; - char buf[len]; - if (stream_read(s, buf, len) < len) - return 0; - if (strncmp(buf, header, len)) - return 0; - stream_seek(s, 0); + if (check >= DEMUX_CHECK_UNSAFE) { + const char header[] = "mplayer EDL file"; + const int len = sizeof(header) - 1; + char buf[len]; + if (stream_read(s, buf, len) < len) + return -1; + if (strncmp(buf, header, len)) + return -1; + stream_seek(s, 0); + } demuxer->file_contents = stream_read_complete(s, demuxer, 1000000); if (demuxer->file_contents.start == NULL) - return 0; - return DEMUXER_TYPE_EDL; + return -1; + return 0; } const struct demuxer_desc demuxer_desc_edl = { - .info = "EDL file demuxer", .name = "edl", - .shortdesc = "EDL", - .author = "Uoti Urpala", - .comment = "", + .desc = "mplayer2 edit decision list", .type = DEMUXER_TYPE_EDL, - .safe_check = true, - .check_file = try_open_file, // no separate .open + .open = try_open_file, }; |