iterative overlapped block based motion estimation for snow

Originally committed as revision 4781 to svn://svn.ffmpeg.org/ffmpeg/trunk

iterative overlapped block based motion estimation for snow
Originally committed as revision 4781 to svn://svn.ffmpeg.org/ffmpeg/trunk
51d6a3cf · Michael Niedermayer · 1338e0cb · 51d6a3cf · 51d6a3cf · 51d6a3cf
Commit 51d6a3cf authored Dec 28, 2005 by Michael Niedermayer
Expand all Hide whitespace changes
Inline Side-by-side

Showing with 386 additions and 45 deletions

ffmpeg.c ffmpeg.c +3 -0

avcodec.h libavcodec/avcodec.h +4 -1

snow.c libavcodec/snow.c +379 -44

No files found.
--- a/ffmpeg.c
+++ b/ffmpeg.c
@@ -2770,6 +2770,9 @@ const char *motion_str[] = {
    "phods",
    "epzs",
    "x1",
+    "hex",
+    "umh",
+    "iter",
    NULL,
 };


--- a/libavcodec/avcodec.h
+++ b/libavcodec/avcodec.h
@@ -289,7 +289,10 @@ enum Motion_Est_ID {
    ME_LOG,
    ME_PHODS,
    ME_EPZS,
-    ME_X1
+    ME_X1,
+    ME_HEX,
+    ME_UMH,
+    ME_ITER,
 };

 enum AVDiscard{

--- a/libavcodec/snow.c
+++ b/libavcodec/snow.c