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)
* qatar/master:
  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