Merge commit '944f60866f507e3c0850ae9c2f30dac1da54587c'
authorHendrik Leppkes <h.leppkes@gmail.com>
Fri, 7 Aug 2015 07:27:49 +0000 (09:27 +0200)
committerHendrik Leppkes <h.leppkes@gmail.com>
Fri, 7 Aug 2015 07:27:49 +0000 (09:27 +0200)
commitb54cf4b8863d86e312ea19e5577913be4b773146
treec12b37e0d6cec857bb4377f90b8eb668e8c813ed
parentc47c781e83fd00914be244988381ace0b1b71628
parent944f60866f507e3c0850ae9c2f30dac1da54587c
Merge commit '944f60866f507e3c0850ae9c2f30dac1da54587c'

* commit '944f60866f507e3c0850ae9c2f30dac1da54587c':
  asfdec: read values properly

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
libavformat/asfdec_o.c