summaryrefslogtreecommitdiffstats
path: root/player/core.h
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2016-01-21 22:24:20 +0100
committerwm4 <wm4@nowhere>2016-01-22 00:25:44 +0100
commit7bb9203f7fec1ad4e40a7ae58d68b604c0a4565e (patch)
tree6454f416b7ef2c5612ba1b4bdc66a0839530e1f5 /player/core.h
parentfef8b7984be5a6244612d346bd60d2badd4a2e63 (diff)
downloadmpv-7bb9203f7fec1ad4e40a7ae58d68b604c0a4565e.tar.bz2
mpv-7bb9203f7fec1ad4e40a7ae58d68b604c0a4565e.tar.xz
player: refactor: eliminate MPContext.d_audio
Diffstat (limited to 'player/core.h')
-rw-r--r--player/core.h5
1 files changed, 2 insertions, 3 deletions
diff --git a/player/core.h b/player/core.h
index 00d1c81460..dc6c1f3e2b 100644
--- a/player/core.h
+++ b/player/core.h
@@ -145,8 +145,9 @@ struct track {
// Current subtitle state (or cached state if selected==false).
struct dec_sub *d_sub;
- // Current video decoding state (NULL if selected==false)
+ // Current decoding state (NULL if selected==false)
struct dec_video *d_video;
+ struct dec_audio *d_audio;
// For external subtitles, which are read fully on init. Do not attempt
// to read packets from them.
@@ -287,8 +288,6 @@ typedef struct MPContext {
// Currently, this is used for the secondary subtitle track only.
struct track *current_track[NUM_PTRACKS][STREAM_TYPE_COUNT];
- struct dec_audio *d_audio;
-
// Uses: accessing metadata (consider ordered chapters case, where the main
// demuxer defines metadata), or special purpose demuxers like TV.
struct demuxer *master_demuxer;