aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2002-03-10 03:17:53 +0000
committerMichael Niedermayer <michaelni@gmx.at>2002-03-10 03:17:53 +0000
commit1699d37681d44493c790c680e8f1b7d6b602a31b (patch)
treef4ba3a0cf4efe63289c35b72402fec4af19da83d
parent7ff037e9ca9949ec17e9fdf389523e37ad7592d9 (diff)
downloadffmpeg-1699d37681d44493c790c680e8f1b7d6b602a31b.tar.gz
divx5 draw_edges bugfix
Originally committed as revision 322 to svn://svn.ffmpeg.org/ffmpeg/trunk
-rw-r--r--libavcodec/mpegvideo.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/mpegvideo.c b/libavcodec/mpegvideo.c
index a513174276..83f0796c8b 100644
--- a/libavcodec/mpegvideo.c
+++ b/libavcodec/mpegvideo.c
@@ -445,12 +445,12 @@ void MPV_frame_end(MpegEncContext *s)
{
/* draw edge for correct motion prediction if outside */
if (s->pict_type != B_TYPE && !s->intra_only) {
- if(s->avctx==NULL || s->avctx->codec->id!=CODEC_ID_MPEG4){
+ if(s->avctx==NULL || s->avctx->codec->id!=CODEC_ID_MPEG4 || s->divx_version==500){
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{
- /* OpenDivx, but i dunno how to distinguish it from mpeg4 */
+ /* mpeg4? / opendivx / xvid */
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);