diff options
| author | Hendrik Leppkes <h.leppkes@gmail.com> | 2012-02-27 17:21:16 +0100 |
|---|---|---|
| committer | Martin Storsjö <martin@martin.st> | 2012-06-26 11:59:24 +0300 |
| commit | ea1c5011b34287aaad8c4fdc9100c3fe6b167134 (patch) | |
| tree | cf39b1c27728227ca9ff40cfc0521f6870f3e100 | |
| parent | 059533489250e58f1726ed2d1cb61869b2e00ed0 (diff) | |
| download | ffmpeg-ea1c5011b34287aaad8c4fdc9100c3fe6b167134.tar.gz | |
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.
Signed-off-by: Martin Storsjö <martin@martin.st>
| -rw-r--r-- | libavcodec/dxva2_h264.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libavcodec/dxva2_h264.c b/libavcodec/dxva2_h264.c index ffe71a9656..5cdf5dea5c 100644 --- a/libavcodec/dxva2_h264.c +++ b/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 Libav) */ (0 << 3) | |