[FFmpeg-cvslog] Merge commit 'b1432e905d462198a8d7834b256848f2b9e4f8e6' into release/1.1

[Michael Niedermayer]

ffmpeg | branch: release/1.1 | Michael Niedermayer <michaelni at gmx.at> | Mon Apr 21 16:32:39 2014 +0200| [1552b850db5472f2fa023040d207779bca311820] | committer: Michael Niedermayer

Merge commit 'b1432e905d462198a8d7834b256848f2b9e4f8e6' into release/1.1

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

Merged-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=1552b850db5472f2fa023040d207779bca311820
---