Chiebot-Mirror
/
FFmpeg
mirror of https://github.com/FFmpeg/FFmpeg.git
8
0
Fork 0
Code Issues Projects Releases Wiki Activity

Rename remaining url_fseek to avio_seek.

Browse Source
pull/2/head
Clément Bœsch 13 years ago
parent eef3ea8c71
commit 39edfcc9e8
2 changed files with 8 additions and 8 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      libavformat/act.c
  2. 12
      libavformat/bintext.c

4
libavformat/act.c
Unescape View File

@ -92,7 +92,7 @@ static int read_header(AVFormatContext *s,
st->codec->codec_id=CODEC_ID_G729; st->codec->codec_id=CODEC_ID_G729;
url_fseek(pb, 257, SEEK_SET); avio_seek(pb, 257, SEEK_SET);
msec=get_le16(pb); msec=get_le16(pb);
sec=get_byte(pb); sec=get_byte(pb);
min=get_le32(pb); min=get_le32(pb);
@ -101,7 +101,7 @@ static int read_header(AVFormatContext *s,
ctx->bytes_left_in_chunk=CHUNK_SIZE; ctx->bytes_left_in_chunk=CHUNK_SIZE;
url_fseek(pb, 512, SEEK_SET); avio_seek(pb, 512, SEEK_SET);
return 0; return 0;
} }

12
libavformat/bintext.c
Unescape View File

@ -64,7 +64,7 @@ static int next_tag_read(AVFormatContext *avctx, uint64_t *fsize)
int len; int len;
uint64_t start_pos = url_fsize(pb) - 256; uint64_t start_pos = url_fsize(pb) - 256;
url_fseek(pb, start_pos, SEEK_SET); avio_seek(pb, start_pos, SEEK_SET);
if (get_buffer(pb, buf, sizeof(next_magic)) != sizeof(next_magic)) if (get_buffer(pb, buf, sizeof(next_magic)) != sizeof(next_magic))
return -1; return -1;
if (memcmp(buf, next_magic, sizeof(next_magic))) if (memcmp(buf, next_magic, sizeof(next_magic)))
@ -149,7 +149,7 @@ static int bintext_read_header(AVFormatContext *s,
predict_width(st->codec, bin->fsize, got_width); predict_width(st->codec, bin->fsize, got_width);
if (!ap->height) if (!ap->height)
calculate_height(st->codec, bin->fsize); calculate_height(st->codec, bin->fsize);
url_fseek(pb, 0, SEEK_SET); avio_seek(pb, 0, SEEK_SET);
} }
return 0; return 0;
}; };
@ -203,7 +203,7 @@ static int xbin_read_header(AVFormatContext *s,
if (!url_is_streamed(pb)) { if (!url_is_streamed(pb)) {
bin->fsize = url_fsize(pb) - 9 - st->codec->extradata_size; bin->fsize = url_fsize(pb) - 9 - st->codec->extradata_size;
ff_sauce_read(s, &bin->fsize, NULL, 0); ff_sauce_read(s, &bin->fsize, NULL, 0);
url_fseek(pb, 9 + st->codec->extradata_size, SEEK_SET); avio_seek(pb, 9 + st->codec->extradata_size, SEEK_SET);
} }
return 0; return 0;
@ -248,7 +248,7 @@ static int adf_read_header(AVFormatContext *s,
ff_sauce_read(s, &bin->fsize, &got_width, 0); ff_sauce_read(s, &bin->fsize, &got_width, 0);
if (!ap->height) if (!ap->height)
calculate_height(st->codec, bin->fsize); calculate_height(st->codec, bin->fsize);
url_fseek(pb, 1 + 192 + 4096, SEEK_SET); avio_seek(pb, 1 + 192 + 4096, SEEK_SET);
} }
return 0; return 0;
} }
@ -291,7 +291,7 @@ static int idf_read_header(AVFormatContext *s,
st->codec->extradata[0] = 16; st->codec->extradata[0] = 16;
st->codec->extradata[1] = BINTEXT_PALETTE|BINTEXT_FONT; st->codec->extradata[1] = BINTEXT_PALETTE|BINTEXT_FONT;
url_fseek(pb, url_fsize(pb) - 4096 - 48, SEEK_SET); avio_seek(pb, avio_size(pb) - 4096 - 48, SEEK_SET);
if (get_buffer(pb, st->codec->extradata + 2 + 48, 4096) < 0) if (get_buffer(pb, st->codec->extradata + 2 + 48, 4096) < 0)
return AVERROR(EIO); return AVERROR(EIO);
@ -302,7 +302,7 @@ static int idf_read_header(AVFormatContext *s,
ff_sauce_read(s, &bin->fsize, &got_width, 0); ff_sauce_read(s, &bin->fsize, &got_width, 0);
if (!ap->height) if (!ap->height)
calculate_height(st->codec, bin->fsize); calculate_height(st->codec, bin->fsize);
url_fseek(pb, 12, SEEK_SET); avio_seek(pb, 12, SEEK_SET);
return 0; return 0;
} }
#endif /* CONFIG_IDF_DEMUXER */ #endif /* CONFIG_IDF_DEMUXER */

Write Preview
Loading…
Cancel
Save