summaryrefslogtreecommitdiffstats
path: root/stream
diff options
context:
space:
mode:
authorreimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2>2013-04-26 19:50:19 +0000
committerwm4 <wm4@nowhere>2013-04-27 15:28:57 +0200
commitdaee1a04e7eea66f820934368371c6e2b8c759ba (patch)
tree987874136245b329869ed4cdaeb4cc47d220a980 /stream
parent2f004875d3bc0b951e04b203a5bcc818faccf065 (diff)
downloadmpv-daee1a04e7eea66f820934368371c6e2b8c759ba.tar.bz2
mpv-daee1a04e7eea66f820934368371c6e2b8c759ba.tar.xz
stream_bluray: remove the broken -bluray-chapter option
Remove the broken -bluray-chapter option. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@36175 b3059339-0415-0410-9bf9-f77b7e298cf2 Conflicts: DOCS/man/en/mplayer.1 cfg-common.h
Diffstat (limited to 'stream')
-rw-r--r--stream/stream.h3
-rw-r--r--stream/stream_bluray.c15
2 files changed, 2 insertions, 16 deletions
diff --git a/stream/stream.h b/stream/stream.h
index 746667c564..fb3d08097f 100644
--- a/stream/stream.h
+++ b/stream/stream.h
@@ -408,11 +408,10 @@ int stream_read_internal(stream_t *s, void *buf, int len);
/// Internal seek function bypassing the stream buffer
int stream_seek_internal(stream_t *s, int64_t newpos);
-extern int bluray_angle;
-extern int bluray_chapter;
extern int dvd_title;
extern int dvd_angle;
+extern int bluray_angle;
extern char *bluray_device;
typedef struct {
diff --git a/stream/stream_bluray.c b/stream/stream_bluray.c
index 0cc1152310..81fd882f86 100644
--- a/stream/stream_bluray.c
+++ b/stream/stream_bluray.c
@@ -50,7 +50,6 @@
char *bluray_device = NULL;
int bluray_angle = 0;
-int bluray_chapter = 0;
struct bluray_priv_s {
BLURAY *bd;
@@ -246,9 +245,8 @@ static int bluray_stream_open(stream_t *s, int mode,
int title, title_guess, title_count;
uint64_t title_size;
- unsigned int chapter = 0, angle = 0;
+ unsigned int angle = 0;
uint64_t max_duration = 0;
- int64_t chapter_pos = 0;
char *device = NULL;
int i;
@@ -327,16 +325,6 @@ static int bluray_stream_open(stream_t *s, int mode,
if (!info)
goto err_no_info;
- /* Select chapter */
- chapter = bluray_chapter ? bluray_chapter : BLURAY_DEFAULT_CHAPTER;
- chapter = FFMIN(chapter, info->chapter_count);
-
- if (chapter)
- chapter_pos = bd_chapter_pos(bd, chapter);
-
- mp_msg(MSGT_IDENTIFY, MSGL_INFO,
- "ID_BLURAY_CURRENT_CHAPTER=%d\n", chapter + 1);
-
/* Select angle */
angle = bluray_angle ? bluray_angle : BLURAY_DEFAULT_ANGLE;
angle = FFMIN(angle, info->angle_count);
@@ -359,7 +347,6 @@ err_no_info:
b->current_angle = angle;
b->current_title = title;
- s->start_pos = chapter_pos;
s->end_pos = title_size;
s->sector_size = BLURAY_SECTOR_SIZE;
s->flags = mode | MP_STREAM_SEEK;