diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2002-01-10 00:46:40 +0000 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2002-01-10 00:46:40 +0000 |
| commit | ef093645ef508f755ac80ef62cf774e376fe1eb8 (patch) | |
| tree | 0b87bbac5f48f357b4e3a9f0dfb05f1043296a13 /libavcodec | |
| parent | f4470e09369b8b62f90dd3a3efe892d1004a493b (diff) | |
| download | ffmpeg-ef093645ef508f755ac80ef62cf774e376fe1eb8.tar.gz | |
fix different UMV handling for mpeg4 vs. h263 - patch by Michael Niedermayer <michaelni@gmx.at>
Originally committed as revision 249 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/mpegvideo.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/libavcodec/mpegvideo.c b/libavcodec/mpegvideo.c index ec16e78699..edd7872cc9 100644 --- a/libavcodec/mpegvideo.c +++ b/libavcodec/mpegvideo.c @@ -403,15 +403,16 @@ void MPV_frame_end(MpegEncContext *s) { /* draw edge for correct motion prediction if outside */ if (s->pict_type != B_TYPE) { -#if 1 + if(s->avctx->codec->id!=CODEC_ID_MPEG4){ draw_edges(s->current_picture[0], s->linesize, s->mb_width*16, s->mb_height*16, EDGE_WIDTH); draw_edges(s->current_picture[1], s->linesize/2, s->mb_width*8, s->mb_height*8, EDGE_WIDTH/2); draw_edges(s->current_picture[2], s->linesize/2, s->mb_width*8, s->mb_height*8, EDGE_WIDTH/2); -#else + }else{ + /* OpenDivx, but i dunno how to distinguish it from mpeg4 */ draw_edges(s->current_picture[0], s->linesize, s->width, s->height, EDGE_WIDTH); draw_edges(s->current_picture[1], s->linesize/2, s->width/2, s->height/2, EDGE_WIDTH/2); draw_edges(s->current_picture[2], s->linesize/2, s->width/2, s->height/2, EDGE_WIDTH/2); -#endif + } } } |