Merge commit 'f1bdc234370401c032cd85184e93c7c155eb6d62'
authorMichael Niedermayer <michael@niedermayer.cc>
Sun, 12 Jul 2015 14:23:27 +0000 (16:23 +0200)
committerMichael Niedermayer <michael@niedermayer.cc>
Sun, 12 Jul 2015 14:23:42 +0000 (16:23 +0200)
commitcd326377414d02d5f6bec21609d9e6219c481ed4
tree8b2de82d3e42c3643d8916c66e863f75a46deabc
parent189420cb561929e05f5cc4224cdca83740a24a32
parentf1bdc234370401c032cd85184e93c7c155eb6d62
Merge commit 'f1bdc234370401c032cd85184e93c7c155eb6d62'

* commit 'f1bdc234370401c032cd85184e93c7c155eb6d62':
  riff: Validate bitrate

Conflicts:
libavformat/riffdec.c

See: 189420cb561929e05f5cc4224cdca83740a24a32
Merged-by: Michael Niedermayer <michael@niedermayer.cc>
libavformat/riffdec.c