diff options
| author | Stephen Warren <> | 2009-02-17 23:30:07 +0000 |
|---|---|---|
| committer | Carl Eugen Hoyos <cehoyos@rainbow.studorg.tuwien.ac.at> | 2009-02-17 23:30:07 +0000 |
| commit | ef7ae94ba2a728442d0cc26e27b9c6539d0b2a9f (patch) | |
| tree | 750d415f9f7de7db8cb797c23c19364a70d52857 /libavcodec/vdpau.c | |
| parent | 9ba8bc01644fd64150160e0a0ee759e82bc9f2d6 (diff) | |
Fix MBAFF/PAFF samples.
Patch by Stephen Warren, swarren nvidia com
Originally committed as revision 17401 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/vdpau.c')
| -rw-r--r-- | libavcodec/vdpau.c | 2 |
1 files changed, 1 insertions, 1 deletions
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; |