History

dxva2_h264: fix signaling of mbaff frames

The MBAFF flag may only be signaled if we're actually dealing with a full frame, and not singular fields, as it can happen in mixed content.

Hendrik Leppkes committed 14 years ago

Commit b5e6aa61 parent 1c600881 file · +2 −1Browse files

Unified · Split

libavcodec/dxva2_h264.c+2−1
@@ -93,7 +93,8 @@ static void fill_picture_parameters(struct dxva_context *ctx, const H264Context · 92 unmodified lines
93 pp->num_ref_frames = h->sps.ref_frame_count;93 pp->num_ref_frames = h->sps.ref_frame_count;
94 94
95 pp->wBitFields = ((s->picture_structure != PICT_FRAME) << 0) |95 pp->wBitFields = ((s->picture_structure != PICT_FRAME) << 0) |
96 (h->sps.mb_aff << 1) |96 ((h->sps.mb_aff &&
97 (s->picture_structure == PICT_FRAME)) << 1) |
97 (h->sps.residual_color_transform_flag << 2) |98 (h->sps.residual_color_transform_flag << 2) |
98 /* sp_for_switch_flag (not implemented by FFmpeg) */99 /* sp_for_switch_flag (not implemented by FFmpeg) */
99 (0 << 3) |100 (0 << 3) |

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t