# HG changeset patch
# User cehoyos
# Date 1234913407 0
# Node ID 07b5c9735954d50ce8ed80f3abced5adda10152f
# Parent  52c002a02f657b114b59fac9c4e30307cc9edca7
Fix MBAFF/PAFF samples.

Patch by Stephen Warren, swarren nvidia com

diff -r 52c002a02f65 -r 07b5c9735954 vdpau.c
--- a/vdpau.c	Tue Feb 17 22:36:48 2009 +0000
+++ b/vdpau.c	Tue Feb 17 23:30:07 2009 +0000
@@ -151,7 +151,7 @@
     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;