diff options
| author | wm4 <wm4@nowhere> | 2013-07-14 17:59:26 +0200 |
|---|---|---|
| committer | wm4 <wm4@nowhere> | 2013-07-14 17:59:26 +0200 |
| commit | e18ffd6b998858ca0797cb0ce4aabd4a509655dd (patch) | |
| tree | 199bddd30923db1175a1331191eb86ba684e9e41 /stream/stream_bluray.c | |
| parent | 3e7d483ac89289f613138002be2043ec5f479bb0 (diff) | |
| parent | 5ead20bdb3328d199dad693039d18e7a05eb2465 (diff) | |
| download | mpv-e18ffd6b998858ca0797cb0ce4aabd4a509655dd.tar.bz2 mpv-e18ffd6b998858ca0797cb0ce4aabd4a509655dd.tar.xz | |
Merge branch 'remove_old_demuxers'
The merged branch doesn't actually just remove old demuxers, but also
includes a branch of cleanups and some refactoring.
Conflicts:
stream/stream.c
Diffstat (limited to 'stream/stream_bluray.c')
| -rw-r--r-- | stream/stream_bluray.c | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/stream/stream_bluray.c b/stream/stream_bluray.c index 64d1856873..30145203df 100644 --- a/stream/stream_bluray.c +++ b/stream/stream_bluray.c @@ -29,18 +29,19 @@ * */ -#include <libbluray/bluray.h> #include <string.h> #include <assert.h> +#include <libbluray/bluray.h> +#include <libavutil/common.h> + #include "config.h" -#include "libavutil/common.h" -#include "demux/demux.h" #include "talloc.h" #include "core/mp_msg.h" #include "core/m_struct.h" #include "core/m_option.h" #include "stream.h" +#include "demux/stheader.h" #define BLURAY_SECTOR_SIZE 6144 @@ -291,8 +292,7 @@ static int bluray_stream_control(stream_t *s, int cmd, void *arg) return STREAM_UNSUPPORTED; } -static int bluray_stream_open(stream_t *s, int mode, - void *opts, int *file_format) +static int bluray_stream_open(stream_t *s, int mode, void *opts) { struct stream_priv_s *p = opts; struct bluray_priv_s *b; @@ -409,7 +409,6 @@ err_no_info: s->sector_size = BLURAY_SECTOR_SIZE; s->flags = MP_STREAM_SEEK; s->priv = b; - s->type = STREAMTYPE_BLURAY; s->url = strdup("br://"); mp_tmsg(MSGT_OPEN, MSGL_V, "Blu-ray successfully opened.\n"); @@ -418,10 +417,7 @@ err_no_info: } const stream_info_t stream_info_bluray = { - "Blu-ray Disc", "bd", - "Benjamin Zores", - "Play Blu-ray discs through external libbluray", bluray_stream_open, { "bd", "br", "bluray", NULL }, &bluray_stream_opts, |