From ef7ae94ba2a728442d0cc26e27b9c6539d0b2a9f Mon Sep 17 00:00:00 2001
From: Stephen Warren <>
Date: Tue, 17 Feb 2009 23:30:07 +0000
Subject: [PATCH] Fix MBAFF/PAFF samples.
Patch by Stephen Warren, swarren nvidia com
Originally committed as revision 17401 to svn://svn.ffmpeg.org/ffmpeg/trunk
---
libavcodec/vdpau.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/libavcodec/vdpau.c b/libavcodec/vdpau.c
index 0ed413ad68..e222bdfcca 100644
--- a/libavcodec/vdpau.c
+++ b/libavcodec/vdpau.c
@@ -151,7 +151,7 @@ void ff_vdpau_h264_picture_complete(MpegEncContext *s)
render->info.h264.field_pic_flag = s->picture_structure != PICT_FRAME;
render->info.h264.bottom_field_flag = s->picture_structure == PICT_BOTTOM_FIELD;
render->info.h264.num_ref_frames = h->sps.ref_frame_count;
- render->info.h264.mb_adaptive_frame_field_flag = h->sps.mb_aff;
+ render->info.h264.mb_adaptive_frame_field_flag = h->sps.mb_aff && !render->info.h264.field_pic_flag;
render->info.h264.constrained_intra_pred_flag = h->pps.constrained_intra_pred;
render->info.h264.weighted_pred_flag = h->pps.weighted_pred;
render->info.h264.weighted_bipred_idc = h->pps.weighted_bipred_idc;