ffmpeg roll of source to mar 9 version...

patched-ffmpeg-mt/libavcodec/ratecontrol.c

 /*
  * Rate control for video encoders
  *
  * Copyright (c) 2002-2004 Michael Niedermayer <michaelni@gmx.at>
  *
  * This file is part of FFmpeg.
  *
  * FFmpeg 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,
  * 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
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
 /**
  * @file libavcodec/ratecontrol.c
  * Rate control for video encoders.
  */
 
+#include "libavutil/intmath.h"
 #include "avcodec.h"
 #include "dsputil.h"
 #include "ratecontrol.h"
 #include "mpegvideo.h"
 #include "eval.h"
 
 #undef NDEBUG // Always check asserts, the speed effect is far too small to disable them.
 #include <assert.h>
 
 #ifndef M_E
@@ skipping 913 matching lines @@
             "with these parameters.\n");
         return -1;
     } else if (fabs(expected_bits/all_available_bits - 1.0) > 0.01) {
         av_log(s->avctx, AV_LOG_ERROR,
             "[lavc rc] Error: 2pass curve failed to converge\n");
         return -1;
     }
 
     return 0;
 }