Merge commit '582963a815'
* commit '582963a815':
vdpau: Fix VC-1 interlaced mode
Conflicts:
libavcodec/vdpau_vc1.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
commit
bbc7d33a0d
1 changed files with 1 additions and 1 deletions
|
|
@ -59,7 +59,7 @@ static int vdpau_vc1_start_frame(AVCodecContext *avctx,
|
|||
else
|
||||
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->pulldown = v->broadcast;
|
||||
info->interlace = v->interlace;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue