[FFmpeg-cvslog] Merge commit 'f1bdc234370401c032cd85184e93c7c155eb6d62'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michael at niedermayer.cc> | Sun Jul 12 16:23:27 2015 +0200| [cd326377414d02d5f6bec21609d9e6219c481ed4] | committer: Michael Niedermayer

Merge commit 'f1bdc234370401c032cd85184e93c7c155eb6d62'

* commit 'f1bdc234370401c032cd85184e93c7c155eb6d62':
  riff: Validate bitrate

Conflicts:
	libavformat/riffdec.c

See: 189420cb561929e05f5cc4224cdca83740a24a32
Merged-by: Michael Niedermayer <michael at niedermayer.cc>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=cd326377414d02d5f6bec21609d9e6219c481ed4
---