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)
commit57fa9e97424de601a5f10ad7bfc6ce48597c783f
treeaf23f2590b653c8146be13c513b15df8a85b83e4
parent73b1283012cfe89e466fa34da0b2ac1e9fb9893d
parent27c1f82f561932c83191bcd3e70e0cb1712485ba
Merge commit '27c1f82f561932c83191bcd3e70e0cb1712485ba'

* commit '27c1f82f561932c83191bcd3e70e0cb1712485ba':
  nsvdec: remove commented out cruft

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