virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

Merge remote-tracking branch 'ffmpeg-mt/master'

Browse Source 
* ffmpeg-mt/master:
      Update todo.
      Draw edges in MPV_frame_end when encoding

    Conflicts:
        libavcodec/mpegvideo.c

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2011-03-25 02:37:37 +01:00
parent 3eb9e571dc
commit 5d6c5dd36c
2 changed files with 2 additions and 2897 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
libavcodec/mpegvideo.c
View File

@ -1156,7 +1156,8 @@ void MPV_frame_end(MpegEncContext *s)
//just to make sure that all data is rendered. //just to make sure that all data is rendered.
if(CONFIG_MPEG_XVMC_DECODER && s->avctx->xvmc_acceleration){ if(CONFIG_MPEG_XVMC_DECODER && s->avctx->xvmc_acceleration){
ff_xvmc_field_end(s); ff_xvmc_field_end(s);
}else if(!s->avctx->hwaccel }else if((s->error_count || s->encoding)
&& !s->avctx->hwaccel
&& !(s->avctx->codec->capabilities&CODEC_CAP_HWACCEL_VDPAU) && !(s->avctx->codec->capabilities&CODEC_CAP_HWACCEL_VDPAU)
&& s->unrestricted_mv && s->unrestricted_mv
&& s->current_picture.reference && s->current_picture.reference

2896
mt-work/test-failures.txt
View File

File diff suppressed because it is too large Load Diff