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)
* 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

index a4d2c79c64e3d6ff602232503eee4539a728a05c..45b4dcb76fe39fa9e88bd85a73ed3bef409d28d3 100644 (file)
@@ -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)) {