[FFmpeg-cvslog] Merge commit 'a9d50bb578ec04c085a25f1e023f75e0e4499d5e'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Sep 20 15:37:55 2013 +0200| [8c320b3c0831b181585c8285e0b43d1a62fecc52] | committer: Michael Niedermayer

Merge commit 'a9d50bb578ec04c085a25f1e023f75e0e4499d5e'

* commit 'a9d50bb578ec04c085a25f1e023f75e0e4499d5e':
  dcadec: Validate the lfe parameter

Conflicts:
	libavcodec/dcadec.c

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

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