aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJames Almer <jamrial@gmail.com>2017-01-31 15:50:56 -0300
committerJames Almer <jamrial@gmail.com>2017-01-31 15:50:56 -0300
commit1df08cae82d75e01b1250bb9416d6cfbab430e82 (patch)
treea064c88d0de083e64c66c4f946e64890b26f3e98
parentba5d08938130b2545f8b3e73a701989563316e49 (diff)
parentb4bb9593834460bbbe0e70823f2c503cb01ad052 (diff)
downloadffmpeg-1df08cae82d75e01b1250bb9416d6cfbab430e82.tar.gz
Merge commit 'b4bb9593834460bbbe0e70823f2c503cb01ad052'
* commit 'b4bb9593834460bbbe0e70823f2c503cb01ad052': ratecontrol: Drop commented out cruft Merged-by: James Almer <jamrial@gmail.com>
-rw-r--r--libavcodec/ratecontrol.c12
1 files changed, 0 insertions, 12 deletions
diff --git a/libavcodec/ratecontrol.c b/libavcodec/ratecontrol.c
index 3a8ac22ddd..507dcbb33a 100644
--- a/libavcodec/ratecontrol.c
+++ b/libavcodec/ratecontrol.c
@@ -101,12 +101,6 @@ av_cold int ff_rate_control_init(MpegEncContext *s)
"isB",
"avgQP",
"qComp",
-#if 0
- "lastIQP",
- "lastPQP",
- "lastBQP",
- "nextNonBQP",
-#endif
"avgIITex",
"avgPITex",
"avgPPTex",
@@ -394,12 +388,6 @@ static double get_qscale(MpegEncContext *s, RateControlEntry *rce,
rce->pict_type == AV_PICTURE_TYPE_B,
rcc->qscale_sum[pict_type] / (double)rcc->frame_count[pict_type],
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_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],