summaryrefslogtreecommitdiffstats
path: root/player
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2015-02-17 23:43:43 +0100
committerwm4 <wm4@nowhere>2015-02-17 23:43:43 +0100
commit969edb9e0b86500ed0af9c26209ad7000adb5157 (patch)
tree5d65f8f3f2b35965f713c94daf9bf83eef4be6a8 /player
parentf54220d95150ee53a33cc6626b7d0ff8b235c7f0 (diff)
downloadmpv-969edb9e0b86500ed0af9c26209ad7000adb5157.tar.bz2
mpv-969edb9e0b86500ed0af9c26209ad7000adb5157.tar.xz
player: use a macro to remove an element from an array
Should be equivalent.
Diffstat (limited to 'player')
-rw-r--r--player/loadfile.c7
1 files changed, 1 insertions, 6 deletions
diff --git a/player/loadfile.c b/player/loadfile.c
index 2d9f9f4e28..72e0d14590 100644
--- a/player/loadfile.c
+++ b/player/loadfile.c
@@ -658,12 +658,7 @@ bool mp_remove_track(struct MPContext *mpctx, struct track *track)
int index = 0;
while (index < mpctx->num_tracks && mpctx->tracks[index] != track)
index++;
- assert(index < mpctx->num_tracks);
- while (index + 1 < mpctx->num_tracks) {
- mpctx->tracks[index] = mpctx->tracks[index + 1];
- index++;
- }
- mpctx->num_tracks--;
+ MP_TARRAY_REMOVE_AT(mpctx->tracks, mpctx->num_tracks, index);
talloc_free(track);
close_unused_demuxers(mpctx);