Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 5 Mar 2014 12:51:09 +0000 (13:51 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 5 Mar 2014 12:51:44 +0000 (13:51 +0100)
* qatar/master:
  avfilter: Add missing emms_c when needed

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavfilter/af_volume.c
libavfilter/vf_hqdn3d.c

index 8b5d4c4..4ec78b1 100644 (file)
@@ -389,6 +389,8 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *buf)
         }
     }
 
+    emms_c();
+
     if (buf != out_buf)
         av_frame_free(&buf);
 
index 518a23d..f96f238 100644 (file)
@@ -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(...) \