Merge commit '167ea1fbf15ecefa30729f9b8d091ed431bf43bd'
authorHendrik Leppkes <h.leppkes@gmail.com>
Mon, 24 Aug 2015 08:37:50 +0000 (10:37 +0200)
committerHendrik Leppkes <h.leppkes@gmail.com>
Mon, 24 Aug 2015 08:37:50 +0000 (10:37 +0200)
commit87ee98c89866696441f4c63dedc1323f52360902
treee023e7e7fa13effc10efeef6840e60a6ef24d231
parent0f72dfeb5f2499a25ec7e4205e44d0ee64190434
parent167ea1fbf15ecefa30729f9b8d091ed431bf43bd
Merge commit '167ea1fbf15ecefa30729f9b8d091ed431bf43bd'

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

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