diff options
| author | Arne Morten Kvarving <spiff@xbmc.org> | 2012-09-13 14:41:19 -0700 |
|---|---|---|
| committer | Arne Morten Kvarving <spiff@xbmc.org> | 2012-09-13 14:41:19 -0700 |
| commit | 56eda98c9a362dadb453d25e3f70c0c5487dc693 (patch) | |
| tree | 5571186b5ec992ca78f1d0e2077d32327b75ae28 /lib/ffmpeg/libavcodec | |
| parent | 6b0bff50e1b00c51ead9ff0997b13e2ce2d810a7 (diff) | |
| parent | 285685e424be1ebfe4cf0acd41213f366cf86c46 (diff) | |
Merge pull request #1385 from margro/fix_trac_13165
ffmpeg: fixed: DXVA2 playback artifacts on H264 content with mbaff frame...
Diffstat (limited to 'lib/ffmpeg/libavcodec')
| -rw-r--r-- | lib/ffmpeg/libavcodec/dxva2_h264.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/ffmpeg/libavcodec/dxva2_h264.c b/lib/ffmpeg/libavcodec/dxva2_h264.c index b7e025179b..0f76bcfe95 100644 --- a/lib/ffmpeg/libavcodec/dxva2_h264.c +++ b/lib/ffmpeg/libavcodec/dxva2_h264.c @@ -93,7 +93,8 @@ static void fill_picture_parameters(struct dxva_context *ctx, const H264Context pp->num_ref_frames = h->sps.ref_frame_count; pp->wBitFields = ((s->picture_structure != PICT_FRAME) << 0) | - (h->sps.mb_aff << 1) | + ((h->sps.mb_aff && + (s->picture_structure == PICT_FRAME)) << 1) | (h->sps.residual_color_transform_flag << 2) | /* sp_for_switch_flag (not implemented by FFmpeg) */ (0 << 3) | |