Merge commit '167ea1fbf15ecefa30729f9b8d091ed431bf43bd'

* commit '167ea1fbf15ecefa30729f9b8d091ed431bf43bd': xavs: Do not try to set the bitrate tolerance without a bitrate Merged-by: Hendrik Leppkes <[email protected]>
zhengxj91 · Aug 24, 2015 · 87ee98c · 87ee98c
2 parents 0f72dfe + 167ea1f
commit 87ee98c
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/libavcodec/libxavs.c b/libavcodec/libxavs.c
@@ -356,7 +356,7 @@ FF_ENABLE_DEPRECATION_WARNINGS
 
  if (avctx->bit_rate > 0)
  x4->params.rc.f_rate_tolerance =
- (float)avctx->bit_rate_tolerance/avctx->bit_rate;
+ (float)avctx->bit_rate_tolerance / avctx->bit_rate;
 
  if ((avctx->rc_buffer_size) &&
  (avctx->rc_initial_buffer_occupancy <= avctx->rc_buffer_size)) {