diff options
| author | Andreas Rheinhardt <andreas.rheinhardt@outlook.com> | 2025-06-16 00:42:18 +0200 |
|---|---|---|
| committer | Andreas Rheinhardt <andreas.rheinhardt@outlook.com> | 2025-07-03 20:34:51 +0200 |
| commit | fe2dbb12b07ede00da792be62afd523e502cd2bd (patch) | |
| tree | dfd2968894344eab5becd371a767d74c5cab76d8 /libavcodec/vc1_pred.c | |
| parent | aa4a5b1e330673e9ccaf8bfba46faa84c356dce7 (diff) | |
| download | ffmpeg-fe2dbb12b07ede00da792be62afd523e502cd2bd.tar.gz | |
avcodec/vc1: Stop using MpegEncContext.gb
Add a GetBitContext to VC1Context instead. This is in preparation
for removing MpegEncContext.gb.
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
Diffstat (limited to 'libavcodec/vc1_pred.c')
| -rw-r--r-- | libavcodec/vc1_pred.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/libavcodec/vc1_pred.c b/libavcodec/vc1_pred.c index 202fa8cc3b..1ac8f6156b 100644 --- a/libavcodec/vc1_pred.c +++ b/libavcodec/vc1_pred.c @@ -420,7 +420,7 @@ void ff_vc1_pred_mv(VC1Context *v, int n, int dmv_x, int dmv_y, else sum = FFABS(px - field_predA[0]) + FFABS(py - field_predA[1]); if (sum > hybridmv_thresh) { - if (get_bits1(&s->gb)) { // read HYBRIDPRED bit + if (get_bits1(&v->gb)) { // read HYBRIDPRED bit px = field_predA[0]; py = field_predA[1]; } else { @@ -433,7 +433,7 @@ void ff_vc1_pred_mv(VC1Context *v, int n, int dmv_x, int dmv_y, else sum = FFABS(px - field_predC[0]) + FFABS(py - field_predC[1]); if (sum > hybridmv_thresh) { - if (get_bits1(&s->gb)) { + if (get_bits1(&v->gb)) { px = field_predA[0]; py = field_predA[1]; } else { @@ -782,7 +782,7 @@ void ff_vc1_pred_b_mv(VC1Context *v, int dmv_x[2], int dmv_y[2], else sum = FFABS(px - A[0]) + FFABS(py - A[1]); if (sum > 32) { - if (get_bits1(&s->gb)) { + if (get_bits1(&v->gb)) { px = A[0]; py = A[1]; } else { @@ -795,7 +795,7 @@ void ff_vc1_pred_b_mv(VC1Context *v, int dmv_x[2], int dmv_y[2], else sum = FFABS(px - C[0]) + FFABS(py - C[1]); if (sum > 32) { - if (get_bits1(&s->gb)) { + if (get_bits1(&v->gb)) { px = A[0]; py = A[1]; } else { @@ -852,7 +852,7 @@ void ff_vc1_pred_b_mv(VC1Context *v, int dmv_x[2], int dmv_y[2], else sum = FFABS(px - A[0]) + FFABS(py - A[1]); if (sum > 32) { - if (get_bits1(&s->gb)) { + if (get_bits1(&v->gb)) { px = A[0]; py = A[1]; } else { @@ -865,7 +865,7 @@ void ff_vc1_pred_b_mv(VC1Context *v, int dmv_x[2], int dmv_y[2], else sum = FFABS(px - C[0]) + FFABS(py - C[1]); if (sum > 32) { - if (get_bits1(&s->gb)) { + if (get_bits1(&v->gb)) { px = A[0]; py = A[1]; } else { |