mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2024-11-26 19:01:44 +02:00
Merge commit 'ee8704916de79158da8a48a9ea5be819e83d23ba'
* commit 'ee8704916de79158da8a48a9ea5be819e83d23ba': mpegvideo: reindent Conflicts: libavcodec/mpegvideo.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
commit
df4517106a
@ -1656,6 +1656,7 @@ int ff_MPV_frame_start(MpegEncContext *s, AVCodecContext *avctx)
|
||||
for(i=0; i<avctx->height; i++)
|
||||
memset(s->last_picture_ptr->f.data[0] + s->last_picture_ptr->f.linesize[0]*i, 16, avctx->width);
|
||||
}
|
||||
|
||||
ff_thread_report_progress(&s->last_picture_ptr->tf, INT_MAX, 0);
|
||||
ff_thread_report_progress(&s->last_picture_ptr->tf, INT_MAX, 1);
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user