diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2002-03-22 16:51:44 +0000 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2002-03-22 16:51:44 +0000 |
commit | c5b1c10a0e1ed783674b24d787797ffba9bdffc0 (patch) | |
tree | 6c6ceb0eb433ea194900470213366249e83a4fd2 /libavcodec/mpegvideo.c | |
parent | 8a29b31054fb707106e199d73bebb5da67d2017e (diff) | |
download | ffmpeg-c5b1c10a0e1ed783674b24d787797ffba9bdffc0.tar.gz |
fixing epzs & mpeg1 (hopefully now really ...)
Originally committed as revision 348 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/mpegvideo.c')
-rw-r--r-- | libavcodec/mpegvideo.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/libavcodec/mpegvideo.c b/libavcodec/mpegvideo.c index eb963fd4d0..180addb6f6 100644 --- a/libavcodec/mpegvideo.c +++ b/libavcodec/mpegvideo.c @@ -174,7 +174,7 @@ int MPV_common_init(MpegEncContext *s) } } - if (s->out_format == FMT_H263 || s->encoding) { + if (s->out_format == FMT_H263) { int size; /* MV prediction */ size = (2 * s->mb_width + 2) * (2 * s->mb_height + 2); @@ -961,9 +961,8 @@ void MPV_decode_mb(MpegEncContext *s, DCTELEM block[6][64]) else if (s->h263_pred || s->h263_aic) s->mbintra_table[mb_x + mb_y*s->mb_width]=1; - /* update motion predictor, not for B-frames as they need the motion_val from the last P/S-Frame - motion_val is needed for encodig too, as the ME needs it */ - if (s->out_format == FMT_H263 || s->encoding) { + /* update motion predictor, not for B-frames as they need the motion_val from the last P/S-Frame */ + if (s->out_format == FMT_H263) { if(s->pict_type!=B_TYPE){ int xy, wrap, motion_x, motion_y; |