1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-10-30 23:18:11 +02:00

Merge remote-tracking branch 'qatar/master'

* qatar/master:
  avfilter: Add missing emms_c when needed

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer
2014-03-05 13:51:09 +01:00
2 changed files with 3 additions and 0 deletions

View File

@@ -389,6 +389,8 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *buf)
} }
} }
emms_c();
if (buf != out_buf) if (buf != out_buf)
av_frame_free(&buf); av_frame_free(&buf);

View File

@@ -147,6 +147,7 @@ static void denoise_depth(HQDN3DContext *s,
else else
denoise_temporal(src, dst, frame_ant, denoise_temporal(src, dst, frame_ant,
w, h, sstride, dstride, temporal, depth); w, h, sstride, dstride, temporal, depth);
emms_c();
} }
#define denoise(...) \ #define denoise(...) \