Merge commit '27c1f82f561932c83191bcd3e70e0cb1712485ba'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 9 Jul 2014 21:26:09 +0000 (23:26 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 9 Jul 2014 21:26:18 +0000 (23:26 +0200)
* commit '27c1f82f561932c83191bcd3e70e0cb1712485ba':
  nsvdec: remove commented out cruft

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

Simple merge