summaryrefslogtreecommitdiffstats
path: root/demux
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2016-02-16 21:06:02 +0100
committerwm4 <wm4@nowhere>2016-02-16 21:06:02 +0100
commitce0b99314bf309af2d0dc869527f03854abc0d2e (patch)
tree256eff7905290ffec2855cb26de99e2f12a9c98a /demux
parent3c3cd0c540a1ecd11b6a2d633b8e4c963802386d (diff)
downloadmpv-ce0b99314bf309af2d0dc869527f03854abc0d2e.tar.bz2
mpv-ce0b99314bf309af2d0dc869527f03854abc0d2e.tar.xz
demux_timeline: cosmetics: move a function
Gets rid of a forward declaration.
Diffstat (limited to 'demux')
-rw-r--r--demux/demux_timeline.c50
1 files changed, 24 insertions, 26 deletions
diff --git a/demux/demux_timeline.c b/demux/demux_timeline.c
index ef6e5a3890..e52d75fa09 100644
--- a/demux/demux_timeline.c
+++ b/demux/demux_timeline.c
@@ -25,8 +25,6 @@
#include "timeline.h"
#include "stheader.h"
-static void reselect_streams(struct demuxer *demuxer);
-
struct segment {
int index;
double start, end;
@@ -69,6 +67,30 @@ struct priv {
double seek_pts;
};
+static void reselect_streams(struct demuxer *demuxer)
+{
+ struct priv *p = demuxer->priv;
+
+ for (int n = 0; n < p->num_streams; n++) {
+ struct virtual_stream *vs = &p->streams[n];
+ vs->selected = demux_stream_is_selected(vs->sh);
+ }
+
+ for (int n = 0; n < p->num_segments; n++) {
+ struct segment *seg = p->segments[n];
+ for (int i = 0; i < seg->num_stream_map; i++) {
+ struct sh_stream *sh = demux_get_stream(seg->d, i);
+ bool selected = false;
+ if (seg->stream_map[i] >= 0)
+ selected = p->streams[seg->stream_map[i]].selected;
+ // This stops demuxer readahead for inactive segments.
+ if (!p->current || seg->d != p->current->d)
+ selected = false;
+ demuxer_select_track(seg->d, sh, selected);
+ }
+ }
+}
+
static void switch_segment(struct demuxer *demuxer, struct segment *new,
double start_pts, int flags)
{
@@ -349,30 +371,6 @@ static void d_close(struct demuxer *demuxer)
free_demuxer(master);
}
-static void reselect_streams(struct demuxer *demuxer)
-{
- struct priv *p = demuxer->priv;
-
- for (int n = 0; n < p->num_streams; n++) {
- struct virtual_stream *vs = &p->streams[n];
- vs->selected = demux_stream_is_selected(vs->sh);
- }
-
- for (int n = 0; n < p->num_segments; n++) {
- struct segment *seg = p->segments[n];
- for (int i = 0; i < seg->num_stream_map; i++) {
- struct sh_stream *sh = demux_get_stream(seg->d, i);
- bool selected = false;
- if (seg->stream_map[i] >= 0)
- selected = p->streams[seg->stream_map[i]].selected;
- // This stops demuxer readahead for inactive segments.
- if (!p->current || seg->d != p->current->d)
- selected = false;
- demuxer_select_track(seg->d, sh, selected);
- }
- }
-}
-
static int d_control(struct demuxer *demuxer, int cmd, void *arg)
{
struct priv *p = demuxer->priv;