Merge commit 'ff79f6b35a94dde69b3d52bd2abdfdb793f525c3' into release/2.2
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 11 May 2014 15:10:07 +0000 (17:10 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 11 May 2014 15:10:07 +0000 (17:10 +0200)
* commit 'ff79f6b35a94dde69b3d52bd2abdfdb793f525c3':
  avfilter: Add missing emms_c when needed

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

Simple merge
Simple merge