Merge commit 'b1432e905d462198a8d7834b256848f2b9e4f8e6' into release/1.1
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 21 Apr 2014 14:32:39 +0000 (16:32 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 21 Apr 2014 14:33:51 +0000 (16:33 +0200)
* commit 'b1432e905d462198a8d7834b256848f2b9e4f8e6':
  avfilter: Add missing emms_c when needed

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

Simple merge
Simple merge
Simple merge