RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-01-27 01:33:20 +00:00
Code Issues Projects Releases Wiki Activity

Merge commit 'b4bb9593834460bbbe0e70823f2c503cb01ad052'

Browse Source 
* commit 'b4bb9593834460bbbe0e70823f2c503cb01ad052':
  ratecontrol: Drop commented out cruft

Merged-by: James Almer <jamrial@gmail.com>
This commit is contained in:
James Almer 2017-01-31 15:50:56 -03:00
commit 1df08cae82
1 changed files with 0 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
libavcodec/ratecontrol.c
View File

@ -101,12 +101,6 @@ av_cold int ff_rate_control_init(MpegEncContext *s)
"isB", "isB",
"avgQP", "avgQP",
"qComp", "qComp",
#if 0
"lastIQP",
"lastPQP",
"lastBQP",
"nextNonBQP",
#endif
"avgIITex", "avgIITex",
"avgPITex", "avgPITex",
"avgPPTex", "avgPPTex",
@ -394,12 +388,6 @@ static double get_qscale(MpegEncContext *s, RateControlEntry *rce,
rce->pict_type == AV_PICTURE_TYPE_B, rce->pict_type == AV_PICTURE_TYPE_B,
rcc->qscale_sum[pict_type] / (double)rcc->frame_count[pict_type], rcc->qscale_sum[pict_type] / (double)rcc->frame_count[pict_type],
a->qcompress, a->qcompress,
#if 0
rcc->last_qscale_for[AV_PICTURE_TYPE_I],
rcc->last_qscale_for[AV_PICTURE_TYPE_P],
rcc->last_qscale_for[AV_PICTURE_TYPE_B],
rcc->next_non_b_qscale,
#endif
rcc->i_cplx_sum[AV_PICTURE_TYPE_I] / (double)rcc->frame_count[AV_PICTURE_TYPE_I], rcc->i_cplx_sum[AV_PICTURE_TYPE_I] / (double)rcc->frame_count[AV_PICTURE_TYPE_I],
rcc->i_cplx_sum[AV_PICTURE_TYPE_P] / (double)rcc->frame_count[AV_PICTURE_TYPE_P], rcc->i_cplx_sum[AV_PICTURE_TYPE_P] / (double)rcc->frame_count[AV_PICTURE_TYPE_P],
rcc->p_cplx_sum[AV_PICTURE_TYPE_P] / (double)rcc->frame_count[AV_PICTURE_TYPE_P], rcc->p_cplx_sum[AV_PICTURE_TYPE_P] / (double)rcc->frame_count[AV_PICTURE_TYPE_P],