virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-04 22:03:09 +02:00
Code Issues Releases Activity

avcodec/rv34: Make ff_rv34_get_start_offset() honor its name

Browse Source 
Up until now, it only returned the number of bits for the
start offset, but not the start offset; the GetBitContext
passed to it was unused.

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
This commit is contained in:
Andreas Rheinhardt
2025-02-26 11:13:15 +01:00
parent f9b8f30680
commit 3defca7eae
3 changed files with 3 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
libavcodec/rv30.c
View File

@ -38,7 +38,6 @@
static int rv30_parse_slice_header(RV34DecContext *r, GetBitContext *gb, SliceInfo *si) static int rv30_parse_slice_header(RV34DecContext *r, GetBitContext *gb, SliceInfo *si)
{ {
AVCodecContext *avctx = r->s.avctx; AVCodecContext *avctx = r->s.avctx;
int mb_bits;
int w = r->s.width, h = r->s.height; int w = r->s.width, h = r->s.height;
int mb_size; int mb_size;
int rpr; int rpr;
@ -76,8 +75,7 @@ static int rv30_parse_slice_header(RV34DecContext *r, GetBitContext *gb, SliceIn
si->width = w; si->width = w;
si->height = h; si->height = h;
mb_size = ((w + 15) >> 4) * ((h + 15) >> 4); mb_size = ((w + 15) >> 4) * ((h + 15) >> 4);
mb_bits = ff_rv34_get_start_offset(gb, mb_size); si->start = ff_rv34_get_start_offset(gb, mb_size);
si->start = get_bits(gb, mb_bits);
skip_bits1(gb); skip_bits1(gb);
return 0; return 0;
} }

2
libavcodec/rv34.c
View File

@ -342,7 +342,7 @@ int ff_rv34_get_start_offset(GetBitContext *gb, int mb_size)
for(i = 0; i < 5; i++) for(i = 0; i < 5; i++)
if(rv34_mb_max_sizes[i] >= mb_size - 1) if(rv34_mb_max_sizes[i] >= mb_size - 1)
break; break;
return rv34_mb_bits_sizes[i]; return get_bits(gb, rv34_mb_bits_sizes[i]);
} }
/** /**

4
libavcodec/rv40.c
View File

@ -131,7 +131,6 @@ static void rv40_parse_picture_size(GetBitContext *gb, int *w, int *h)
static int rv40_parse_slice_header(RV34DecContext *r, GetBitContext *gb, SliceInfo *si) static int rv40_parse_slice_header(RV34DecContext *r, GetBitContext *gb, SliceInfo *si)
{ {
int mb_bits;
int w = r->s.width, h = r->s.height; int w = r->s.width, h = r->s.height;
int mb_size; int mb_size;
int ret; int ret;
@ -154,8 +153,7 @@ static int rv40_parse_slice_header(RV34DecContext *r, GetBitContext *gb, SliceIn
si->width = w; si->width = w;
si->height = h; si->height = h;
mb_size = ((w + 15) >> 4) * ((h + 15) >> 4); mb_size = ((w + 15) >> 4) * ((h + 15) >> 4);
mb_bits = ff_rv34_get_start_offset(gb, mb_size); si->start = ff_rv34_get_start_offset(gb, mb_size);
si->start = get_bits(gb, mb_bits);
return 0; return 0;
} }