diff options
| author | wm4 <wm4@nowhere> | 2013-12-07 19:32:44 +0100 |
|---|---|---|
| committer | wm4 <wm4@nowhere> | 2013-12-07 19:32:44 +0100 |
| commit | bb6165342db0ba60fefa97afe770b393fd6cb463 (patch) | |
| tree | e97e2a9ab048dd339ff6bfd7112ab9e23bb6e7e6 /mpvcore/player/playloop.c | |
| parent | 75d3bf4711f88a79af5fd3246a9503dbd6e01586 (diff) | |
| download | mpv-bb6165342db0ba60fefa97afe770b393fd6cb463.tar.bz2 mpv-bb6165342db0ba60fefa97afe770b393fd6cb463.tar.xz | |
video: create a separate context for video filter chain
This adds vf_chain, which unlike vf_instance refers to the filter chain
as a whole. This makes the filter API less awkward, and will allow
handling format negotiation better.
Diffstat (limited to 'mpvcore/player/playloop.c')
| -rw-r--r-- | mpvcore/player/playloop.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/mpvcore/player/playloop.c b/mpvcore/player/playloop.c index b069e5c3f7..b87231c709 100644 --- a/mpvcore/player/playloop.c +++ b/mpvcore/player/playloop.c @@ -994,7 +994,8 @@ void run_playloop(struct MPContext *mpctx) if (!vo->frame_loaded && (!mpctx->paused || mpctx->restart_playback)) { double frame_time = update_video(mpctx, endpts); mp_dbg(MSGT_AVSYNC, MSGL_DBG2, "*** ftime=%5.3f ***\n", frame_time); - if (mpctx->d_video->vf_initialized < 0) { + if (mpctx->d_video->vfilter && mpctx->d_video->vfilter->initialized < 0) + { MP_FATAL(mpctx, "\nFATAL: Could not initialize video filters " "(-vf) or video output (-vo).\n"); int uninit = INITIALIZED_VCODEC; |