generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

lavf: replace all uses of url_fskip with avio_seek

Browse Source 
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit e356fc57a2)
This commit is contained in:
Anton Khirnov
2011-02-28 14:57:55 +01:00
committed by Michael Niedermayer
parent f59d8ff8cd
commit 74b3f67c9c
62 changed files with 299 additions and 299 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
libavformat/riff.c
View File

@@ -501,7 +501,7 @@ void ff_get_wav_header(AVIOContext *pb, AVCodecContext *codec, int size)
codec->bits_per_coded_sample = avio_rl16(pb);
codec->channel_layout = avio_rl32(pb); /* dwChannelMask */
id = avio_rl32(pb); /* 4 first bytes of GUID */
url_fskip(pb, 12); /* skip end of GUID */
avio_seek(pb, 12, SEEK_CUR); /* skip end of GUID */
cbSize -= 22;
size -= 22;
}
@@ -514,7 +514,7 @@ void ff_get_wav_header(AVIOContext *pb, AVCodecContext *codec, int size)
/* It is possible for the chunk to contain garbage at the end */
if (size > 0)
url_fskip(pb, size);
avio_seek(pb, size, SEEK_CUR);
}
codec->codec_id = ff_wav_codec_get_id(id, codec->bits_per_coded_sample);
if (codec->codec_id == CODEC_ID_AAC_LATM) {