Merge commit '74942685cb457c01937686892878403a409baf27'

[ffmpeg] / libavcodec / motion_est.h

diff --git a/libavcodec/motion_est.h b/libavcodec/motion_est.h
index 3b63972d6e830c72d06a0ab75972c2c93c2af19b..df9e3c7e8505f96a9464e585f12998ea345dc96f 100644 (file)
--- a/libavcodec/motion_est.h
+++ b/libavcodec/motion_est.h
@@ -1,20 +1,20 @@
 /*
  * Motion estimation
  *
- * This file is part of Libav.
+ * This file is part of FFmpeg.
  *
- * Libav is free software; you can redistribute it and/or
+ * 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.
  *
- * Libav is distributed in the hope that it will be useful,
+ * 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 Libav; if not, write to the Free Software
+ * License along with FFmpeg; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
@@ -29,7 +29,7 @@
 
 struct MpegEncContext;
 
-#define MAX_MV 2048
+#define MAX_MV 4096
 #define ME_MAP_SIZE 64
 
 #define FF_ME_ZERO 0
@@ -77,8 +77,8 @@ typedef struct MotionEstContext {
     int stride;
     int uvstride;
     /* temp variables for picture complexity calculation */
-    int mc_mb_var_sum_temp;
-    int mb_var_sum_temp;
+    int64_t mc_mb_var_sum_temp;
+    int64_t mb_var_sum_temp;
     int scene_change_score;
 
     op_pixels_func(*hpel_put)[4];