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 /video/decode/vd_lavc.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 'video/decode/vd_lavc.c')
-rw-r--r-- | video/decode/vd_lavc.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/video/decode/vd_lavc.c b/video/decode/vd_lavc.c index 10e46b78b1..7683f6c6de 100644 --- a/video/decode/vd_lavc.c +++ b/video/decode/vd_lavc.c @@ -791,8 +791,8 @@ static struct mp_image *decode_with_fallback(struct dec_video *vd, init_avctx(vd, decoder, NULL); if (ctx->avctx) { mpi = NULL; - if (vd->vf_initialized < 0) - vd->vf_initialized = 0; + if (vd->vfilter && vd->vfilter->initialized < 0) + vd->vfilter->initialized = 0; decode(vd, packet, flags, &mpi); return mpi; } |