har0ke/FFmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Move VDPAU check, make future VDPAU patches smaller.

Browse Source 
Originally committed as revision 16508 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Carl Eugen Hoyos 2009-01-09 22:22:40 +00:00
parent fa50a0276f
commit 7eb6ed78ea
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
libavcodec/error_resilience.c
View File

@ -681,6 +681,7 @@ void ff_er_frame_end(MpegEncContext *s){
Picture *pic= s->current_picture_ptr; Picture *pic= s->current_picture_ptr;
if(!s->error_recognition || s->error_count==0 || s->avctx->lowres || if(!s->error_recognition || s->error_count==0 || s->avctx->lowres ||
s->avctx->codec->capabilities&CODEC_CAP_HWACCEL_VDPAU ||
s->error_count==3*s->mb_width*(s->avctx->skip_top + s->avctx->skip_bottom)) return; s->error_count==3*s->mb_width*(s->avctx->skip_top + s->avctx->skip_bottom)) return;
if(s->current_picture.motion_val[0] == NULL){ if(s->current_picture.motion_val[0] == NULL){

2
libavcodec/h264.c
View File

@ -7647,7 +7647,7 @@ static int decode_frame(AVCodecContext *avctx,
* past end by one (callers fault) and resync_mb_y != 0 * past end by one (callers fault) and resync_mb_y != 0
* causes problems for the first MB line, too. * causes problems for the first MB line, too.
*/ */
if (avctx->codec_id != CODEC_ID_H264_VDPAU && !FIELD_PICTURE) if (!FIELD_PICTURE)
ff_er_frame_end(s); ff_er_frame_end(s);
MPV_frame_end(s); MPV_frame_end(s);