[FFmpeg-cvslog] Merge commit '167ea1fbf15ecefa30729f9b8d091ed431bf43bd'

[Hendrik Leppkes]

ffmpeg | branch: master | Hendrik Leppkes <h.leppkes at gmail.com> | Mon Aug 24 10:37:50 2015 +0200| [87ee98c89866696441f4c63dedc1323f52360902] | committer: Hendrik Leppkes

Merge commit '167ea1fbf15ecefa30729f9b8d091ed431bf43bd'

* commit '167ea1fbf15ecefa30729f9b8d091ed431bf43bd':
  xavs: Do not try to set the bitrate tolerance without a bitrate

Merged-by: Hendrik Leppkes <h.leppkes at gmail.com>

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