OSDN Git Service
(root)
/
coroid
/
ffmpeg_saccubus.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
c541e66
)
Warn the user about me_method values that are not supported.
author
Michael Niedermayer
<michaelni@gmx.at>
Sun, 31 Aug 2008 23:55:47 +0000
(23:55 +0000)
committer
Michael Niedermayer
<michaelni@gmx.at>
Sun, 31 Aug 2008 23:55:47 +0000
(23:55 +0000)
Fixes issue503
Originally committed as revision 15135 to svn://svn.ffmpeg.org/ffmpeg/trunk
libavcodec/motion_est.c
patch
|
blob
|
history
diff --git
a/libavcodec/motion_est.c
b/libavcodec/motion_est.c
index
71fe90f
..
5187ef7
100644
(file)
--- a/
libavcodec/motion_est.c
+++ b/
libavcodec/motion_est.c
@@
-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;