mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2024-12-23 12:43:46 +02:00
divx5 draw_edges bugfix
Originally committed as revision 322 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
parent
7ff037e9ca
commit
1699d37681
@ -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);
|
||||
|
Loading…
Reference in New Issue
Block a user