virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-10 06:10:52 +02:00
Code Issues Releases Activity

Merge commit '582963a8156522582e55466be4a59974a8d909a5'

Browse Source 
* commit '582963a8156522582e55466be4a59974a8d909a5':
  vdpau: Fix VC-1 interlaced mode

Conflicts:
	libavcodec/vdpau_vc1.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer
2013-07-26 10:51:42 +02:00
parent af7949fdea 582963a815
commit bbc7d33a0d
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libavcodec/vdpau_vc1.c
View File

@@ -59,7 +59,7 @@ static int vdpau_vc1_start_frame(AVCodecContext *avctx,
else else
info->picture_type = s->pict_type - 1 + s->pict_type / 3; info->picture_type = s->pict_type - 1 + s->pict_type / 3;
info->frame_coding_mode = v->fcm ? v->fcm + 1 : 0; info->frame_coding_mode = v->fcm ? (v->fcm + 1) : 0;
info->postprocflag = v->postprocflag; info->postprocflag = v->postprocflag;
info->pulldown = v->broadcast; info->pulldown = v->broadcast;
info->interlace = v->interlace; info->interlace = v->interlace;