summaryrefslogtreecommitdiffstats
path: root/player
diff options
context:
space:
mode:
Diffstat (limited to 'player')
-rw-r--r--player/loadfile.c18
-rw-r--r--player/misc.c4
-rw-r--r--player/sub.c4
3 files changed, 14 insertions, 12 deletions
diff --git a/player/loadfile.c b/player/loadfile.c
index 07a32c307a..af60aed3e0 100644
--- a/player/loadfile.c
+++ b/player/loadfile.c
@@ -212,8 +212,8 @@ void update_demuxer_properties(struct MPContext *mpctx)
static bool need_init_seek(struct demuxer *demux)
{
- for (int n = 0; n < demux->num_streams; n++) {
- struct sh_stream *stream = demux->streams[n];
+ for (int n = 0; n < demux_get_num_stream(demux); n++) {
+ struct sh_stream *stream = demux_get_stream(demux, n);
// Subtitle streams are not properly interleaved -> force init. seek.
if (stream->type != STREAM_SUB && demux_stream_is_selected(stream))
return false;
@@ -250,8 +250,8 @@ static struct sh_stream *select_fallback_stream(struct demuxer *d,
int index)
{
struct sh_stream *best_stream = NULL;
- for (int n = 0; n < d->num_streams; n++) {
- struct sh_stream *s = d->streams[n];
+ for (int n = 0; n < demux_get_num_stream(d); n++) {
+ struct sh_stream *s = demux_get_stream(d, n);
if (s->type == type) {
best_stream = s;
if (index == 0)
@@ -396,8 +396,10 @@ static struct track *add_stream_track(struct MPContext *mpctx,
void add_demuxer_tracks(struct MPContext *mpctx, struct demuxer *demuxer)
{
- for (int n = 0; n < demuxer->num_streams; n++)
- add_stream_track(mpctx, demuxer, demuxer->streams[n], !!mpctx->timeline);
+ for (int n = 0; n < demux_get_num_stream(demuxer); n++) {
+ add_stream_track(mpctx, demuxer, demux_get_stream(demuxer, n),
+ !!mpctx->timeline);
+ }
}
// Result numerically higher => better match. 0 == no match.
@@ -708,8 +710,8 @@ struct track *mp_add_external_file(struct MPContext *mpctx, char *filename,
demux_set_ts_offset(demuxer, -demuxer->start_time);
struct track *first = NULL;
- for (int n = 0; n < demuxer->num_streams; n++) {
- struct sh_stream *sh = demuxer->streams[n];
+ for (int n = 0; n < demux_get_num_stream(demuxer); n++) {
+ struct sh_stream *sh = demux_get_stream(demuxer, n);
if (sh->type == filter) {
struct track *t = add_stream_track(mpctx, demuxer, sh, false);
t->is_external = true;
diff --git a/player/misc.c b/player/misc.c
index 0b2548b98b..fc98136e5c 100644
--- a/player/misc.c
+++ b/player/misc.c
@@ -106,8 +106,8 @@ double get_main_demux_pts(struct MPContext *mpctx)
{
double main_new_pos = MP_NOPTS_VALUE;
if (mpctx->demuxer) {
- for (int n = 0; n < mpctx->demuxer->num_streams; n++) {
- struct sh_stream *stream = mpctx->demuxer->streams[n];
+ for (int n = 0; n < demux_get_num_stream(mpctx->demuxer); n++) {
+ struct sh_stream *stream = demux_get_stream(mpctx->demuxer, n);
if (main_new_pos == MP_NOPTS_VALUE && stream->type != STREAM_SUB)
main_new_pos = demux_get_next_pts(stream);
}
diff --git a/player/sub.c b/player/sub.c
index 9ec7ba5e7b..df84e910af 100644
--- a/player/sub.c
+++ b/player/sub.c
@@ -146,8 +146,8 @@ void reset_subtitle_state(struct MPContext *mpctx)
void uninit_stream_sub_decoders(struct demuxer *demuxer)
{
- for (int i = 0; i < demuxer->num_streams; i++) {
- struct sh_stream *sh = demuxer->streams[i];
+ for (int i = 0; i < demux_get_num_stream(demuxer); i++) {
+ struct sh_stream *sh = demux_get_stream(demuxer, i);
if (sh->sub) {
sub_destroy(sh->sub->dec_sub);
sh->sub->dec_sub = NULL;