[SCM] libav/master: avfilter: Add missing emms_c when needed
siretart at users.alioth.debian.org
siretart at users.alioth.debian.org
Sun May 4 21:36:32 UTC 2014
The following commit has been merged in the master branch:
commit b1432e905d462198a8d7834b256848f2b9e4f8e6
Author: Luca Barbato <lu_zero at gentoo.org>
Date: Wed Mar 5 10:41:33 2014 +0100
avfilter: Add missing emms_c when needed
Arch specific calls should have an emms_c following to keep the cpu
state consistent.
Reported-By: wm4
CC: libav-stable at libav.org
(cherry picked from commit e995cf1bccc6e91bbaa6a8771e23fb3ab259c110)
diff --git a/libavfilter/af_volume.c b/libavfilter/af_volume.c
index 3f3ad47..c8e8897 100644
--- a/libavfilter/af_volume.c
+++ b/libavfilter/af_volume.c
@@ -282,6 +282,8 @@ static int filter_frame(AVFilterLink *inlink, AVFilterBufferRef *buf)
}
}
+ emms_c();
+
if (buf != out_buf)
avfilter_unref_buffer(buf);
diff --git a/libavfilter/vf_gradfun.c b/libavfilter/vf_gradfun.c
index 79e1490..b9fd50f 100644
--- a/libavfilter/vf_gradfun.c
+++ b/libavfilter/vf_gradfun.c
@@ -117,6 +117,7 @@ static void filter(GradFunContext *ctx, uint8_t *dst, uint8_t *src, int width, i
ctx->filter_line(dst + y * dst_linesize, src + y * src_linesize, dc - r / 2, width, thresh, dither[y & 7]);
if (++y >= height) break;
}
+ emms_c();
}
static av_cold int init(AVFilterContext *ctx, const char *args)
diff --git a/libavfilter/vf_hqdn3d.c b/libavfilter/vf_hqdn3d.c
index e2d90d5..ae794d8 100644
--- a/libavfilter/vf_hqdn3d.c
+++ b/libavfilter/vf_hqdn3d.c
@@ -155,6 +155,7 @@ static void denoise_depth(HQDN3DContext *hqdn3d,
else
denoise_temporal(src, dst, frame_ant,
w, h, sstride, dstride, temporal, depth);
+ emms_c();
}
#define denoise(...) \
--
Libav/FFmpeg packaging
More information about the pkg-multimedia-commits
mailing list