[FFmpeg-cvslog] r17401 - trunk/libavcodec/vdpau.c

[cehoyos]

Author: cehoyos
Date: Wed Feb 18 00:30:07 2009
New Revision: 17401

Log:
Fix MBAFF/PAFF samples.

Patch by Stephen Warren, swarren nvidia com

Modified:
   trunk/libavcodec/vdpau.c

Modified: trunk/libavcodec/vdpau.c
==============================================================================
--- trunk/libavcodec/vdpau.c	Tue Feb 17 23:36:48 2009	(r17400)
+++ trunk/libavcodec/vdpau.c	Wed Feb 18 00:30:07 2009	(r17401)
@@ -151,7 +151,7 @@ void ff_vdpau_h264_picture_complete(Mpeg
     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;