diff options
| author | Luca Barbato <lu_zero@gentoo.org> | 2011-11-26 13:28:48 +0100 |
|---|---|---|
| committer | Luca Barbato <lu_zero@gentoo.org> | 2011-11-28 00:40:22 +0100 |
| commit | 1f948745c3cbe45c4ccd5d8996fc885d826bf3ff (patch) | |
| tree | 8b19bd91c0fd5b3399d61121a0cf01ac132722a5 /libavcodec/dxva2_vc1.c | |
| parent | 9270b8a3d1dd5bc9adbf77ed67a00aa7426737bb (diff) | |
| download | ffmpeg-1f948745c3cbe45c4ccd5d8996fc885d826bf3ff.tar.gz | |
vc1: use an enum for Frame Coding Mode
Document it a little and possibly fix a bug in dxva2_vc1.
Diffstat (limited to 'libavcodec/dxva2_vc1.c')
| -rw-r--r-- | libavcodec/dxva2_vc1.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/dxva2_vc1.c b/libavcodec/dxva2_vc1.c index ba6416b719..f8b74a2b35 100644 --- a/libavcodec/dxva2_vc1.c +++ b/libavcodec/dxva2_vc1.c @@ -68,7 +68,7 @@ static void fill_picture_parameters(AVCodecContext *avctx, pp->bPicStructure |= 0x01; if (s->picture_structure & PICT_BOTTOM_FIELD) pp->bPicStructure |= 0x02; - pp->bSecondField = v->interlace && v->fcm != 0x03 && !s->first_field; + pp->bSecondField = v->interlace && v->fcm != ILACE_FIELD && !s->first_field; pp->bPicIntra = s->pict_type == AV_PICTURE_TYPE_I; pp->bPicBackwardPrediction = s->pict_type == AV_PICTURE_TYPE_B; pp->bBidirectionalAveragingMode = (1 << 7) | @@ -100,7 +100,7 @@ static void fill_picture_parameters(AVCodecContext *avctx, (s->resync_marker << 4) | (v->rangered << 3) | (s->max_b_frames ); - pp->bPicExtrapolation = (!v->interlace || v->fcm == 0x00) ? 1 : 2; + pp->bPicExtrapolation = (!v->interlace || v->fcm == PROGRESSIVE) ? 1 : 2; pp->bPicDeblocked = ((v->profile != PROFILE_ADVANCED && v->rangeredfrm) << 5) | (s->loop_filter << 1); pp->bPicDeblockConfined = (v->postprocflag << 7) | |