diff options
| author | wm4 <wm4@nowhere> | 2013-12-21 23:15:32 +0100 |
|---|---|---|
| committer | wm4 <wm4@nowhere> | 2013-12-21 23:15:32 +0100 |
| commit | 0a3e9a9ac3a90da831b497e0613dfb66bc14f3d2 (patch) | |
| tree | b70f214f8c3fc802d6d6edbf8395273c854ac0fd /stream/stream_dvd_common.h | |
| parent | a4fe95b0d8d339ba5afbdb5346ad8fd367a4a1c1 (diff) | |
| parent | 245e5b844177e9ad9a9c07eff5efab7c3fccdebc (diff) | |
| download | mpv-0a3e9a9ac3a90da831b497e0613dfb66bc14f3d2.tar.bz2 mpv-0a3e9a9ac3a90da831b497e0613dfb66bc14f3d2.tar.xz | |
Merge branch 'msg_refactor'
This branch changes mp_msg() so that it doesn't require global context.
The changes are pretty violent.
Diffstat (limited to 'stream/stream_dvd_common.h')
| -rw-r--r-- | stream/stream_dvd_common.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/stream/stream_dvd_common.h b/stream/stream_dvd_common.h index 0a6c6789e1..4a1aef9af0 100644 --- a/stream/stream_dvd_common.h +++ b/stream/stream_dvd_common.h @@ -22,11 +22,12 @@ #include "config.h" #include <inttypes.h> #include <dvdread/ifo_types.h> +#include "stream.h" extern const char * const dvd_audio_stream_channels[6]; extern const char * const dvd_audio_stream_types[8]; -void dvd_set_speed(char *device, unsigned speed); +void dvd_set_speed(stream_t *stream, char *device, unsigned speed); int mp_dvdtimetomsec(dvd_time_t *dt); #endif /* MPLAYER_STREAM_DVD_COMMON_H */ |