openharmony/third_party_ffmpeg
1
0
Fork 0
mirror of https://gitee.com/openharmony/third_party_ffmpeg synced 2024-11-24 03:39:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

get_bits(32) fix

Browse Source 
Originally committed as revision 3393 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Michael Niedermayer 2004-08-16 01:25:52 +00:00
parent 6d45cb7219
commit 8a515d2d9c
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
libavcodec/mjpeg.c
View File

@ -1915,21 +1915,21 @@ read_header:
skip_bits(&hgb, 32); /* reserved zeros */
if (get_bits(&hgb, 32) != be2me_32(ff_get_fourcc("mjpg")))
if (get_bits_long(&hgb, 32) != be2me_32(ff_get_fourcc("mjpg")))
{
dprintf("not mjpeg-b (bad fourcc)\n");
return 0;
}
field_size = get_bits(&hgb, 32); /* field size */
field_size = get_bits_long(&hgb, 32); /* field size */
dprintf("field size: 0x%x\n", field_size);
skip_bits(&hgb, 32); /* padded field size */
second_field_offs = get_bits(&hgb, 32);
second_field_offs = get_bits_long(&hgb, 32);
dprintf("second field offs: 0x%x\n", second_field_offs);
if (second_field_offs)
s->interlaced = 1;
dqt_offs = get_bits(&hgb, 32);
dqt_offs = get_bits_long(&hgb, 32);
dprintf("dqt offs: 0x%x\n", dqt_offs);
if (dqt_offs)
{
@ -1938,7 +1938,7 @@ read_header:
mjpeg_decode_dqt(s);
}
dht_offs = get_bits(&hgb, 32);
dht_offs = get_bits_long(&hgb, 32);
dprintf("dht offs: 0x%x\n", dht_offs);
if (dht_offs)
{
@ -1947,7 +1947,7 @@ read_header:
mjpeg_decode_dht(s);
}
sof_offs = get_bits(&hgb, 32);
sof_offs = get_bits_long(&hgb, 32);
dprintf("sof offs: 0x%x\n", sof_offs);
if (sof_offs)
{
@ -1957,7 +1957,7 @@ read_header:
return -1;
}
sos_offs = get_bits(&hgb, 32);
sos_offs = get_bits_long(&hgb, 32);
dprintf("sos offs: 0x%x\n", sos_offs);
if (sos_offs)
{

6
libavcodec/vp3.c
View File

@ -2719,16 +2719,16 @@ static int theora_decode_comments(AVCodecContext *avctx, GetBitContext gb)
{
int nb_comments, i, tmp;
tmp = get_bits(&gb, 32);
tmp = get_bits_long(&gb, 32);
tmp = be2me_32(tmp);
while(tmp--)
skip_bits(&gb, 8);
nb_comments = get_bits(&gb, 32);
nb_comments = get_bits_long(&gb, 32);
nb_comments = be2me_32(nb_comments);
for (i = 0; i < nb_comments; i++)
{
tmp = get_bits(&gb, 32);
tmp = get_bits_long(&gb, 32);
tmp = be2me_32(tmp);
while(tmp--)
skip_bits(&gb, 8);