MrBesen
/
ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

avformat/oggparsetheora: Replace get_bits_long() by get_bits() where possible 

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
This commit is contained in:
Michael Niedermayer 2019-11-24 15:30:51 +01:00
parent e900621074
commit 9a8471e3f0
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
libavformat/oggparsetheora.c
View File

@ -65,7 +65,7 @@ static int theora_header(AVFormatContext *s, int idx)
/* 0x80"theora" */
skip_bits_long(&gb, 7 * 8);
thp->version = get_bits_long(&gb, 24);
thp->version = get_bits(&gb, 24);
if (thp->version < 0x030100) {
av_log(s, AV_LOG_ERROR,
"Too old or unsupported Theora (%x)\n", thp->version);
@ -79,8 +79,8 @@ static int theora_header(AVFormatContext *s, int idx)
skip_bits(&gb, 100);
if (thp->version >= 0x030200) {
int width = get_bits_long(&gb, 24);
int height = get_bits_long(&gb, 24);
int width = get_bits(&gb, 24);
int height = get_bits(&gb, 24);
if (width <= st->codecpar->width && width > st->codecpar->width - 16 &&
height <= st->codecpar->height && height > st->codecpar->height - 16) {
st->codecpar->width = width;
@ -99,8 +99,8 @@ static int theora_header(AVFormatContext *s, int idx)
}
avpriv_set_pts_info(st, 64, timebase.num, timebase.den);
st->sample_aspect_ratio.num = get_bits_long(&gb, 24);
st->sample_aspect_ratio.den = get_bits_long(&gb, 24);
st->sample_aspect_ratio.num = get_bits(&gb, 24);
st->sample_aspect_ratio.den = get_bits(&gb, 24);
if (thp->version >= 0x030200)
skip_bits_long(&gb, 38);