aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2003-07-16 18:20:46 +0000
committerMichael Niedermayer <michaelni@gmx.at>2003-07-16 18:20:46 +0000
commitcf48e6f8dcf9a942070e235105f9e203dc8440ae (patch)
tree44cdf5b06bbbc1a58bdcece66dfb304d37170a52 /libavcodec
parent6674a126967325fbbeb36fc9d1a0c57fc07d7012 (diff)
downloadffmpeg-cf48e6f8dcf9a942070e235105f9e203dc8440ae.tar.gz
edge fix
Originally committed as revision 2053 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec')
-rw-r--r--libavcodec/motion_est.c9
1 files changed, 2 insertions, 7 deletions
diff --git a/libavcodec/motion_est.c b/libavcodec/motion_est.c
index 58b96d4897..47cb4141c1 100644
--- a/libavcodec/motion_est.c
+++ b/libavcodec/motion_est.c
@@ -809,13 +809,8 @@ static inline void get_limits(MpegEncContext *s, int *range, int *xmin, int *ymi
if (s->unrestricted_mv) {
*xmin = -16;
*ymin = -16;
- if(s->avctx->codec->id!=CODEC_ID_MPEG4){
- *xmax = s->mb_width*16;
- *ymax = s->mb_height*16;
- }else {
- *xmax = s->width;
- *ymax = s->height;
- }
+ *xmax = s->mb_width*16;
+ *ymax = s->mb_height*16;
} else {
*xmin = 0;
*ymin = 0;