diff options
| author | wm4 <wm4@nowhere> | 2014-09-25 23:38:23 +0200 |
|---|---|---|
| committer | wm4 <wm4@nowhere> | 2014-09-25 23:54:18 +0200 |
| commit | d191de856486174faec188ad142ef3ff1b347bd4 (patch) | |
| tree | 0bf66226ecea6a704b9d204cf465b35a7b9c318b /stream/stream_dvd_common.h | |
| parent | d8f993705c8403c527990cce961073c91143d1e7 (diff) | |
| download | mpv-d191de856486174faec188ad142ef3ff1b347bd4.tar.bz2 mpv-d191de856486174faec188ad142ef3ff1b347bd4.tar.xz | |
stream_dvd: better .ifo probing
stream_dvd.c includes a pseudo-protocol that recognizes .IFO files, and
plays them using libdvdread. This was relatively lazy, and could perhaps
easily trigger with files that just had the .ifo extension.
Make the checks stricter, and even probe the file header. Apparently the
first bytes in an .ifo file are always "DVDVIDEO-VTS", so check for
this.
Refuse to load the main "video_ts.ifo". The plan is to use stream_dvdnav
for it.
This also removes at least 1 memory leak.
Diffstat (limited to 'stream/stream_dvd_common.h')
| -rw-r--r-- | stream/stream_dvd_common.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/stream/stream_dvd_common.h b/stream/stream_dvd_common.h index a2b05e8b77..96dfbb3cb3 100644 --- a/stream/stream_dvd_common.h +++ b/stream/stream_dvd_common.h @@ -20,7 +20,7 @@ #define MPLAYER_STREAM_DVD_COMMON_H #include <inttypes.h> -#include <dvdread/ifo_types.h> +#include <stdbool.h> #include "stream.h" extern const char * const dvd_audio_stream_channels[6]; @@ -29,4 +29,6 @@ extern const char * const dvd_audio_stream_types[8]; void dvd_set_speed(stream_t *stream, char *device, unsigned speed); int mp_dvdtimetomsec(dvd_time_t *dt); +int dvd_probe(const char *path, const char *ext, const char *sig); + #endif /* MPLAYER_STREAM_DVD_COMMON_H */ |