cook: Make constants passed to AV_BE2NE32C() unsigned to avoid signed overflow.

[ffmpeg] / libavcodec / libxvid_rc.c

diff --git a/libavcodec/libxvid_rc.c b/libavcodec/libxvid_rc.c
index f06f5b96053732bab07d0ef2fb1a7e51d42f62e8..c830767058c6335c6399c33b876fce54e8ceee53 100644 (file)
--- a/libavcodec/libxvid_rc.c
+++ b/libavcodec/libxvid_rc.c
@@ -1,22 +1,22 @@
 /*
- * xvid Rate control wrapper for lavc video encoders
+ * Xvid rate control wrapper for lavc video encoders
  *
  * Copyright (c) 2006 Michael Niedermayer <michaelni@gmx.at>
  *
- * This file is part of FFmpeg.
+ * This file is part of Libav.
  *
- * FFmpeg is free software; you can redistribute it and/or
+ * Libav is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation; either
  * version 2.1 of the License, or (at your option) any later version.
  *
- * FFmpeg is distributed in the hope that it will be useful,
+ * Libav is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with FFmpeg; if not, write to the Free Software
+ * License along with Libav; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
@@ -30,24 +30,20 @@
 #undef NDEBUG
 #include <assert.h>
 
-extern unsigned int xvid_debug;
-
 int ff_xvid_rate_control_init(MpegEncContext *s){
     char *tmp_name;
     int fd, i;
-    xvid_plg_create_t xvid_plg_create;
-    xvid_plugin_2pass2_t xvid_2pass2;
-
-//xvid_debug=-1;
+    xvid_plg_create_t xvid_plg_create = { 0 };
+    xvid_plugin_2pass2_t xvid_2pass2  = { 0 };
 
-    fd=av_tempfile("xvidrc.", &tmp_name);
+    fd=ff_tempfile("xvidrc.", &tmp_name);
     if (fd == -1) {
         av_log(NULL, AV_LOG_ERROR, "Can't create temporary pass2 file.\n");
         return -1;
     }
 
     for(i=0; i<s->rc_context.num_entries; i++){
-        static const char *frame_types = " ipbs";
+        static const char frame_types[] = " ipbs";
         char tmp[256];
         RateControlEntry *rce;
 
@@ -57,13 +53,11 @@ int ff_xvid_rate_control_init(MpegEncContext *s){
             frame_types[rce->pict_type], (int)lrintf(rce->qscale / FF_QP2LAMBDA), rce->i_count, s->mb_num - rce->i_count - rce->skip_count,
             rce->skip_count, (rce->i_tex_bits + rce->p_tex_bits + rce->misc_bits+7)/8, (rce->header_bits+rce->mv_bits+7)/8);
 
-//av_log(NULL, AV_LOG_ERROR, "%s\n", tmp);
         write(fd, tmp, strlen(tmp));
     }
 
     close(fd);
 
-    memset(&xvid_2pass2, 0, sizeof(xvid_2pass2));
     xvid_2pass2.version= XVID_MAKE_VERSION(1,1,0);
     xvid_2pass2.filename= tmp_name;
     xvid_2pass2.bitrate= s->avctx->bit_rate;
@@ -71,7 +65,6 @@ int ff_xvid_rate_control_init(MpegEncContext *s){
     xvid_2pass2.vbv_maxrate= s->avctx->rc_max_rate;
     xvid_2pass2.vbv_initial= s->avctx->rc_initial_buffer_occupancy;
 
-    memset(&xvid_plg_create, 0, sizeof(xvid_plg_create));
     xvid_plg_create.version= XVID_MAKE_VERSION(1,1,0);
     xvid_plg_create.fbase= s->avctx->time_base.den;
     xvid_plg_create.fincr= s->avctx->time_base.num;
@@ -85,9 +78,8 @@ int ff_xvid_rate_control_init(MpegEncContext *s){
 }
 
 float ff_xvid_rate_estimate_qscale(MpegEncContext *s, int dry_run){
-    xvid_plg_data_t xvid_plg_data;
+    xvid_plg_data_t xvid_plg_data = { 0 };
 
-    memset(&xvid_plg_data, 0, sizeof(xvid_plg_data));
     xvid_plg_data.version= XVID_MAKE_VERSION(1,1,0);
     xvid_plg_data.width = s->width;
     xvid_plg_data.height= s->height;
@@ -104,10 +96,6 @@ float ff_xvid_rate_estimate_qscale(MpegEncContext *s, int dry_run){
     xvid_plg_data.bquant_offset = 0; //  100 * s->avctx->b_quant_offset;
     xvid_plg_data.bquant_ratio = 100; // * s->avctx->b_quant_factor;
 
-#if 0
-    xvid_plg_data.stats.hlength= X
-#endif
-
     if(!s->rc_context.dry_run_qscale){
         if(s->picture_number){
             xvid_plg_data.length=
@@ -134,7 +122,7 @@ float ff_xvid_rate_estimate_qscale(MpegEncContext *s, int dry_run){
     if(!dry_run)
         s->rc_context.dry_run_qscale= 0;
 
-    if(s->pict_type == B_TYPE) //FIXME this is not exactly identical to xvid
+    if(s->pict_type == AV_PICTURE_TYPE_B) //FIXME this is not exactly identical to xvid
         return xvid_plg_data.quant * FF_QP2LAMBDA * s->avctx->b_quant_factor + s->avctx->b_quant_offset;
     else
         return xvid_plg_data.quant * FF_QP2LAMBDA;
@@ -145,4 +133,3 @@ void ff_xvid_rate_control_uninit(MpegEncContext *s){
 
     xvid_plugin_2pass2(s->rc_context.non_lavc_opaque, XVID_PLG_DESTROY, &xvid_plg_destroy, NULL);
 }
-