diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2002-03-15 04:10:53 +0000 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2002-03-15 04:10:53 +0000 |
commit | d6231b9e70f0dc2413c668691e744687b939e411 (patch) | |
tree | 424b084a9b24376869acdd0097880c055167b4a0 /libavcodec/mpegvideo.c | |
parent | 49c9325f56a3d4cc239fb5c4dcaf73a9465b0609 (diff) | |
download | ffmpeg-d6231b9e70f0dc2413c668691e744687b939e411.tar.gz |
use ac prediction in mpeg4 encoding (5% smaller intra-blocks/keyframes)
some minor optimizations
last non zero index cant be 64 bugfix
Originally committed as revision 331 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/mpegvideo.c')
-rw-r--r-- | libavcodec/mpegvideo.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/libavcodec/mpegvideo.c b/libavcodec/mpegvideo.c index 0aefd709c5..1b97cb699b 100644 --- a/libavcodec/mpegvideo.c +++ b/libavcodec/mpegvideo.c @@ -552,7 +552,7 @@ static inline void gmc1_motion(MpegEncContext *s, int dxy, offset, mx, my, src_x, src_y, height, linesize; int motion_x, motion_y; - if(s->real_sprite_warping_points>1) printf("Oops, thats bad, contact the developers\n"); + if(s->real_sprite_warping_points>1) printf("more than 1 warp point isnt supported\n"); motion_x= s->sprite_offset[0][0]; motion_y= s->sprite_offset[0][1]; src_x = s->mb_x * 16 + (motion_x >> (s->sprite_warping_accuracy+1)); @@ -1247,6 +1247,8 @@ static void encode_picture(MpegEncContext *s, int picture_number) case FMT_H263: if (s->h263_msmpeg4) msmpeg4_encode_mb(s, s->block, motion_x, motion_y); + else if(s->h263_pred) + mpeg4_encode_mb(s, s->block, motion_x, motion_y); else h263_encode_mb(s, s->block, motion_x, motion_y); break; |