Merge commit 'b1432e905d462198a8d7834b256848f2b9e4f8e6' into release/1.1

* commit 'b1432e905d462198a8d7834b256848f2b9e4f8e6':
  avfilter: Add missing emms_c when needed

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer
2014-04-21 16:32:39 +02:00
3 changed files with 4 additions and 0 deletions

View File

@@ -275,6 +275,8 @@ static int filter_frame(AVFilterLink *inlink, AVFilterBufferRef *buf)
} }
} }
emms_c();
if (buf != out_buf) if (buf != out_buf)
avfilter_unref_buffer(buf); avfilter_unref_buffer(buf);

View File

@@ -129,6 +129,7 @@ static void filter(GradFunContext *ctx, uint8_t *dst, const uint8_t *src, int wi
ctx->filter_line(dst + y * dst_linesize, src + y * src_linesize, dc - r / 2, width, thresh, dither[y & 7]); ctx->filter_line(dst + y * dst_linesize, src + y * src_linesize, dc - r / 2, width, thresh, dither[y & 7]);
if (++y >= height) break; if (++y >= height) break;
} }
emms_c();
} }
static av_cold int init(AVFilterContext *ctx, const char *args) static av_cold int init(AVFilterContext *ctx, const char *args)

View File

@@ -155,6 +155,7 @@ static void denoise_depth(HQDN3DContext *hqdn3d,
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(...) \