[FFmpeg-cvslog] Merge commit '7c51d79ca7badfb370c410b8f44c9142b938e2e6'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Jan 27 19:53:46 2015 +0100| [b04cbbe25555e5026bbe9cdc5f13ceaeeee3e535] | committer: Michael Niedermayer

Merge commit '7c51d79ca7badfb370c410b8f44c9142b938e2e6'

* commit '7c51d79ca7badfb370c410b8f44c9142b938e2e6':
  nsvdec: validate channels and samplerate

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

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