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)
commitea28034f5d35652ff6a174929fe3ecdbd0cbad35
treef3ae4a4d63a36bc551df04fba518fb0a57629448
parent6452b3159982565a56621f1d5a77b6a6e5306f70
parentff79f6b35a94dde69b3d52bd2abdfdb793f525c3
Merge commit 'ff79f6b35a94dde69b3d52bd2abdfdb793f525c3' into release/2.2

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

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