[SCM] libav/experimental: In crop filter, reference picref after updating w/h, fix issue #2377
siretart at users.alioth.debian.org
siretart at users.alioth.debian.org
Sun Jun 30 17:19:23 UTC 2013
The following commit has been merged in the experimental branch:
commit 3ff9995350b7914c056bbc8440f44bf725dbb1d3
Author: Baptiste Coudurier <baptiste.coudurier at gmail.com>
Date: Wed Nov 24 01:32:49 2010 +0000
In crop filter, reference picref after updating w/h, fix issue #2377
Originally committed as revision 25818 to svn://svn.ffmpeg.org/ffmpeg/trunk
diff --git a/libavfilter/vf_crop.c b/libavfilter/vf_crop.c
index 61019ef..88356c6 100644
--- a/libavfilter/vf_crop.c
+++ b/libavfilter/vf_crop.c
@@ -237,12 +237,14 @@ static void start_frame(AVFilterLink *link, AVFilterBufferRef *picref)
{
AVFilterContext *ctx = link->dst;
CropContext *crop = ctx->priv;
- AVFilterBufferRef *ref2 = avfilter_ref_buffer(picref, ~0);
+ AVFilterBufferRef *ref2;
int i;
picref->video->w = crop->w;
picref->video->h = crop->h;
+ ref2 = avfilter_ref_buffer(picref, ~0);
+
crop->var_values[VAR_T] = picref->pts == AV_NOPTS_VALUE ?
NAN : picref->pts * av_q2d(link->time_base);
crop->var_values[VAR_POS] = picref->pos == -1 ? NAN : picref->pos;
--
Libav/FFmpeg packaging
More information about the pkg-multimedia-commits
mailing list