Merge commit '7c51d79ca7badfb370c410b8f44c9142b938e2e6'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 27 Jan 2015 18:53:46 +0000 (19:53 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 27 Jan 2015 18:53:50 +0000 (19:53 +0100)
* commit '7c51d79ca7badfb370c410b8f44c9142b938e2e6':
  nsvdec: validate channels and samplerate

See: d633e15d7d939f532326e2bc92097b12eba4d5ae
Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavformat/nsvdec.c

Simple merge