summaryrefslogtreecommitdiffstats
path: root/mplayer.c
diff options
context:
space:
mode:
authorUoti Urpala <uau@mplayer2.org>2011-08-08 07:42:28 +0300
committerUoti Urpala <uau@mplayer2.org>2011-08-08 07:42:28 +0300
commitc6141b03f49d91509592dc7e11e3f6fbcddd0e39 (patch)
treec6bb09e081c22e96f012b98d6b3673d78c12e2c7 /mplayer.c
parent8d1e5354e43d25e839c953bd0319163cf6c95d82 (diff)
downloadmpv-c6141b03f49d91509592dc7e11e3f6fbcddd0e39.tar.bz2
mpv-c6141b03f49d91509592dc7e11e3f6fbcddd0e39.tar.xz
core: minor audio-only+timeline fix for chapter handling
Remove outdated "!mpctx->sh_video" checks in chapter seeking and naming functions left over from when timeline functionality did not support audio-only case.
Diffstat (limited to 'mplayer.c')
-rw-r--r--mplayer.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/mplayer.c b/mplayer.c
index 7ddcf48a5c..dcbd4b598d 100644
--- a/mplayer.c
+++ b/mplayer.c
@@ -3487,7 +3487,7 @@ int get_current_chapter(struct MPContext *mpctx)
// currently returns a string allocated with malloc, not talloc
char *chapter_display_name(struct MPContext *mpctx, int chapter)
{
- if (!mpctx->chapters || !mpctx->sh_video)
+ if (!mpctx->chapters)
return demuxer_chapter_display_name(mpctx->demuxer, chapter);
return talloc_strdup(NULL, mpctx->chapters[chapter].name);
}
@@ -3496,7 +3496,7 @@ int seek_chapter(struct MPContext *mpctx, int chapter, double *seek_pts,
char **chapter_name)
{
mpctx->last_chapter_seek = -2;
- if (!mpctx->chapters || !mpctx->sh_video) {
+ if (!mpctx->chapters) {
int res = demuxer_seek_chapter(mpctx->demuxer, chapter, seek_pts,
chapter_name);
if (res >= 0) {