Merge commit '1b4c468477f3b8d372da8ef4e5405539ad9c1501'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 30 Jun 2015 10:59:16 +0000 (12:59 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 30 Jun 2015 10:59:16 +0000 (12:59 +0200)
commit6d9dfb1267d0a5b23ed3e857526bbca74223313a
tree590dc3dcddab0ff417b095d96a99f9621e7f8f88
parent3cd6b6aa0f847afeeac7742489f139ce39b4bdcb
parent1b4c468477f3b8d372da8ef4e5405539ad9c1501
Merge commit '1b4c468477f3b8d372da8ef4e5405539ad9c1501'

* commit '1b4c468477f3b8d372da8ef4e5405539ad9c1501':
  riff: Validate the wav header size before trying to parse it

Conflicts:
libavformat/riffdec.c

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