[FFmpeg-cvslog] r15135 - trunk/libavcodec/motion_est.c

[michael]

Author: michael
Date: Mon Sep  1 01:55:47 2008
New Revision: 15135

Log:
Warn the user about me_method values that are not supported.
Fixes issue503


Modified:
   trunk/libavcodec/motion_est.c

Modified: trunk/libavcodec/motion_est.c
==============================================================================
--- trunk/libavcodec/motion_est.c	(original)
+++ trunk/libavcodec/motion_est.c	Mon Sep  1 01:55:47 2008
@@ -240,6 +240,10 @@ int ff_init_me(MpegEncContext *s){
         av_log(s->avctx, AV_LOG_ERROR, "ME_MAP size is too small for SAB diamond\n");
         return -1;
     }
+    if(s->me_method!=ME_ZERO && s->me_method!=ME_EPZS && s->me_method!=ME_X1){
+        av_log(s->avctx, AV_LOG_ERROR, "me_method is only allowed to be set to zero and epzs; for hex,umh,full and others see dia_size\n");
+        return -1;
+    }
 
     c->avctx= s->avctx;