diff options
| author | wm4 <wm4@nowhere> | 2015-04-23 19:21:17 +0200 |
|---|---|---|
| committer | wm4 <wm4@nowhere> | 2015-04-23 19:21:17 +0200 |
| commit | e9ca0b1522a799e9d52e6aafc58fc316398f40b6 (patch) | |
| tree | 026b8ff8e7cceff3ac259cefd4cab8fb594a8f51 /demux/demux.h | |
| parent | 457e2f7e02e2952671b5923424d0a2b5295a1a6a (diff) | |
| download | mpv-e9ca0b1522a799e9d52e6aafc58fc316398f40b6.tar.bz2 mpv-e9ca0b1522a799e9d52e6aafc58fc316398f40b6.tar.xz | |
demux_mkv: move global options to the demuxer
The options don't change, but they're now declared and used privately by
demux_mkv.c. This also brings with it a minor refactor of the subpreroll
seek handling - merge the code from playloop.c into demux_mkv.c. The
change in demux.c is pretty much equivalent as well.
Diffstat (limited to 'demux/demux.h')
| -rw-r--r-- | demux/demux.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/demux/demux.h b/demux/demux.h index b730724ed3..f3ed97c386 100644 --- a/demux/demux.h +++ b/demux/demux.h @@ -67,7 +67,6 @@ struct demux_ctrl_stream_ctrl { #define SEEK_FACTOR (1 << 1) // argument is in range [0,1] #define SEEK_FORWARD (1 << 2) // prefer later time if not exact #define SEEK_BACKWARD (1 << 3) // prefer earlier time if not exact -#define SEEK_SUBPREROLL (1 << 4) // try to get more subtitle packets #define SEEK_HR (1 << 5) // hr-seek (this is a weak hint only) // Strictness of the demuxer open format check. |