Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 5 Mar 2014 12:51:09 +0000 (13:51 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 5 Mar 2014 12:51:44 +0000 (13:51 +0100)
commite3c93f1f84a339d40315987963f636222b3ed72d
treeb6a01d67f3150598527abb5e3951cabcb06916ad
parent5abbeefd5e64ee229eeb226cc7109046f09f14b3
parente995cf1bccc6e91bbaa6a8771e23fb3ab259c110
Merge remote-tracking branch 'qatar/master'

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

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