summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2013-08-09 18:42:29 +0200
committerwm4 <wm4@nowhere>2013-08-11 20:08:00 +0200
commitabe47a4840fda23aa3f54e45bb9d5c5df1f7909c (patch)
tree358599710b5083d08cfa24ff8395bf34fb8faf7e
parentc6db8f6a8bea199910b8ca4d381621e9ca581821 (diff)
downloadmpv-abe47a4840fda23aa3f54e45bb9d5c5df1f7909c.tar.bz2
mpv-abe47a4840fda23aa3f54e45bb9d5c5df1f7909c.tar.xz
core: make sure hw decoding works when playing multiple files
The hw decoding context was set only for the first file (when the VO was initialized), instead of every file.
-rw-r--r--mpvcore/mplayer.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/mpvcore/mplayer.c b/mpvcore/mplayer.c
index cac24363f9..e7c21cc272 100644
--- a/mpvcore/mplayer.c
+++ b/mpvcore/mplayer.c
@@ -2384,13 +2384,13 @@ int reinit_video_chain(struct MPContext *mpctx)
&(bool){false});
}
mpctx->initialized_flags |= INITIALIZED_VO;
-
- // dynamic allocation only to make stheader.h lighter
- talloc_free(sh_video->hwdec_info);
- sh_video->hwdec_info = talloc_zero(sh_video, struct mp_hwdec_info);
- vo_control(mpctx->video_out, VOCTRL_GET_HWDEC_INFO, sh_video->hwdec_info);
}
+ // dynamic allocation only to make stheader.h lighter
+ talloc_free(sh_video->hwdec_info);
+ sh_video->hwdec_info = talloc_zero(sh_video, struct mp_hwdec_info);
+ vo_control(mpctx->video_out, VOCTRL_GET_HWDEC_INFO, sh_video->hwdec_info);
+
vo_update_window_title(mpctx);
if (stream_control(mpctx->sh_video->gsh->demuxer->stream,