diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-03-05 13:51:09 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-03-05 13:51:44 +0100 |
| commit | e3c93f1f84a339d40315987963f636222b3ed72d (patch) | |
| tree | b6a01d67f3150598527abb5e3951cabcb06916ad /libavfilter | |
| parent | 5abbeefd5e64ee229eeb226cc7109046f09f14b3 (diff) | |
| parent | e995cf1bccc6e91bbaa6a8771e23fb3ab259c110 (diff) | |
| download | ffmpeg-e3c93f1f84a339d40315987963f636222b3ed72d.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
avfilter: Add missing emms_c when needed
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavfilter')
| -rw-r--r-- | libavfilter/af_volume.c | 2 | ||||
| -rw-r--r-- | libavfilter/vf_hqdn3d.c | 1 |
2 files changed, 3 insertions, 0 deletions
diff --git a/libavfilter/af_volume.c b/libavfilter/af_volume.c index 8b5d4c404a..4ec78b1486 100644 --- a/libavfilter/af_volume.c +++ b/libavfilter/af_volume.c @@ -389,6 +389,8 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *buf) } } + emms_c(); + if (buf != out_buf) av_frame_free(&buf); diff --git a/libavfilter/vf_hqdn3d.c b/libavfilter/vf_hqdn3d.c index 518a23d424..f96f2384c4 100644 --- a/libavfilter/vf_hqdn3d.c +++ b/libavfilter/vf_hqdn3d.c @@ -147,6 +147,7 @@ static void denoise_depth(HQDN3DContext *s, else denoise_temporal(src, dst, frame_ant, w, h, sstride, dstride, temporal, depth); + emms_c(); } #define denoise(...) \ |