[FFmpeg-cvslog] Merge commit 'b4bb9593834460bbbe0e70823f2c503cb01ad052'

James Almer git at videolan.org
Tue Jan 31 20:51:57 EET 2017


ffmpeg | branch: master | James Almer <jamrial at gmail.com> | Tue Jan 31 15:50:56 2017 -0300| [1df08cae82d75e01b1250bb9416d6cfbab430e82] | committer: James Almer

Merge commit 'b4bb9593834460bbbe0e70823f2c503cb01ad052'

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

Merged-by: James Almer <jamrial at gmail.com>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=1df08cae82d75e01b1250bb9416d6cfbab430e82
---

 libavcodec/ratecontrol.c | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/libavcodec/ratecontrol.c b/libavcodec/ratecontrol.c
index 3a8ac22..507dcbb 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],


======================================================================




More information about the ffmpeg-cvslog mailing list