diff options
| author | Hendrik Leppkes <h.leppkes@gmail.com> | 2015-08-24 10:37:50 +0200 |
|---|---|---|
| committer | Hendrik Leppkes <h.leppkes@gmail.com> | 2015-08-24 10:37:50 +0200 |
| commit | 87ee98c89866696441f4c63dedc1323f52360902 (patch) | |
| tree | e023e7e7fa13effc10efeef6840e60a6ef24d231 /libavcodec | |
| parent | 0f72dfeb5f2499a25ec7e4205e44d0ee64190434 (diff) | |
| parent | 167ea1fbf15ecefa30729f9b8d091ed431bf43bd (diff) | |
| download | ffmpeg-87ee98c89866696441f4c63dedc1323f52360902.tar.gz | |
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>
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/libxavs.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/libxavs.c b/libavcodec/libxavs.c index a4d2c79c64..45b4dcb76f 100644 --- 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)) { |