summaryrefslogtreecommitdiffstats
path: root/mpvcore/player/osd.c
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2013-11-23 21:36:20 +0100
committerwm4 <wm4@nowhere>2013-11-23 21:36:20 +0100
commit3486302514db31b8086f46226d9b46d53810d1e7 (patch)
treea5b35e0a67d4cee1b5ec8bb0d489f38495d66b3c /mpvcore/player/osd.c
parent057af4697cf65709012f41ff2f0d97b918c51d79 (diff)
downloadmpv-3486302514db31b8086f46226d9b46d53810d1e7.tar.bz2
mpv-3486302514db31b8086f46226d9b46d53810d1e7.tar.xz
video: move decoder context from sh_video into new struct
This is similar to the sh_audio commit. This is mostly cosmetic in nature, except that it also adds automatical freeing of the decoder driver's state struct (which was in sh_video->context, now in dec_video->priv). Also remove all the stheader.h fields that are not needed anymore.
Diffstat (limited to 'mpvcore/player/osd.c')
-rw-r--r--mpvcore/player/osd.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/mpvcore/player/osd.c b/mpvcore/player/osd.c
index 04052c359e..6f81deae2e 100644
--- a/mpvcore/player/osd.c
+++ b/mpvcore/player/osd.c
@@ -85,7 +85,6 @@ void write_status_line(struct MPContext *mpctx, const char *line)
void print_status(struct MPContext *mpctx)
{
struct MPOpts *opts = mpctx->opts;
- sh_video_t * const sh_video = mpctx->sh_video;
update_window_title(mpctx, false);
@@ -110,7 +109,7 @@ void print_status(struct MPContext *mpctx)
if (mpctx->d_audio)
saddf(&line, "A");
- if (mpctx->sh_video)
+ if (mpctx->d_video)
saddf(&line, "V");
saddf(&line, ": ");
@@ -131,7 +130,7 @@ void print_status(struct MPContext *mpctx)
saddf(&line, " x%4.2f", opts->playback_speed);
// A-V sync
- if (mpctx->d_audio && sh_video && mpctx->sync_audio_to_video) {
+ if (mpctx->d_audio && mpctx->d_video && mpctx->sync_audio_to_video) {
if (mpctx->last_av_difference != MP_NOPTS_VALUE)
saddf(&line, " A-V:%7.3f", mpctx->last_av_difference);
else
@@ -152,7 +151,7 @@ void print_status(struct MPContext *mpctx)
#endif
{
// VO stats
- if (sh_video && mpctx->drop_frame_cnt)
+ if (mpctx->d_video && mpctx->drop_frame_cnt)
saddf(&line, " Late: %d", mpctx->drop_frame_cnt);
}