diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-07-26 10:51:42 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-07-26 10:51:42 +0200 |
| commit | bbc7d33a0d7dad79f3d514349b0ba321121b80fe (patch) | |
| tree | c9c25913c6594aece028b07f8019eba8fd69a657 /libavcodec | |
| parent | af7949fdea2f3115c82143178a22a39afe7bbde1 (diff) | |
| parent | 582963a8156522582e55466be4a59974a8d909a5 (diff) | |
| download | ffmpeg-bbc7d33a0d7dad79f3d514349b0ba321121b80fe.tar.gz | |
Merge commit '582963a8156522582e55466be4a59974a8d909a5'
* commit '582963a8156522582e55466be4a59974a8d909a5':
vdpau: Fix VC-1 interlaced mode
Conflicts:
libavcodec/vdpau_vc1.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/vdpau_vc1.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/vdpau_vc1.c b/libavcodec/vdpau_vc1.c index 993ef2614a..26f4887585 100644 --- a/libavcodec/vdpau_vc1.c +++ b/libavcodec/vdpau_vc1.c @@ -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; |