diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2002-03-27 21:25:22 +0000 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2002-03-27 21:25:22 +0000 |
| commit | ba6802debf8167f8b9259e83f820dfb53c15a227 (patch) | |
| tree | 7b2026be763be17427d263c2f74d9a818e5154eb /libavcodec/h263.c | |
| parent | 52075cdeaa0cfd5fede7eddf7d037c226783de4b (diff) | |
4MV motion estimation (not finished yet)
SAD functions rewritten (8x8 support & MMX2 optimizations)
HQ inter/intra decission
msmpeg4 encoding bugfix (MV where too long)
Originally committed as revision 362 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/h263.c')
| -rw-r--r-- | libavcodec/h263.c | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/libavcodec/h263.c b/libavcodec/h263.c index c7fdf557bb..317db431a0 100644 --- a/libavcodec/h263.c +++ b/libavcodec/h263.c @@ -469,14 +469,8 @@ void h263_encode_mb(MpegEncContext * s, } /* encode each block */ - if (s->h263_pred) { - for (i = 0; i < 6; i++) { -// mpeg4_encode_block(s, block[i], i); - } - } else { - for (i = 0; i < 6; i++) { - h263_encode_block(s, block[i], i); - } + for (i = 0; i < 6; i++) { + h263_encode_block(s, block[i], i); } } @@ -778,8 +772,8 @@ void h263_encode_init(MpegEncContext *s) s->mv_penalty= mv_penalty; //FIXME exact table for msmpeg4 & h263p // use fcodes >1 only for mpeg4 & h263 & h263p FIXME - if(s->h263_plus) s->fcode_tab= umv_fcode_tab; - else if(s->h263_pred) s->fcode_tab= fcode_tab; + if(s->h263_plus) s->fcode_tab= umv_fcode_tab; + else if(s->h263_pred && !s->h263_msmpeg4) s->fcode_tab= fcode_tab; } static void h263_encode_block(MpegEncContext * s, DCTELEM * block, int n) |