[FFmpeg-cvslog] Merge remote-tracking branch 'qatar/master'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sat Dec  7 11:48:25 2013 +0100| [4dfc8f69b258f4f30bb1b3e7040f96e1ead5bd5d] | committer: Michael Niedermayer

Merge remote-tracking branch 'qatar/master'

* qatar/master:
  dcadec: Decode LFE to avoid adding random data when downmixing with LFE

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

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