generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge commit '167ea1fbf15ecefa30729f9b8d091ed431bf43bd'

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

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
This commit is contained in:
Hendrik Leppkes 2015-08-24 10:37:50 +02:00
commit 87ee98c898
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libavcodec/libxavs.c
View File

@ -356,7 +356,7 @@ FF_ENABLE_DEPRECATION_WARNINGS
if (avctx->bit_rate > 0) if (avctx->bit_rate > 0)
x4->params.rc.f_rate_tolerance = 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) && if ((avctx->rc_buffer_size) &&
(avctx->rc_initial_buffer_occupancy <= avctx->rc_buffer_size)) { (avctx->rc_initial_buffer_occupancy <= avctx->rc_buffer_size)) {