Revision a2704c97 libavformat/r3d.c
| libavformat/r3d.c | ||
|---|---|---|
| 38 | 38 |
|
| 39 | 39 |
static int read_atom(AVFormatContext *s, Atom *atom) |
| 40 | 40 |
{
|
| 41 |
atom->offset = url_ftell(s->pb);
|
|
| 41 |
atom->offset = avio_tell(s->pb);
|
|
| 42 | 42 |
atom->size = avio_rb32(s->pb); |
| 43 | 43 |
if (atom->size < 8) |
| 44 | 44 |
return -1; |
| ... | ... | |
| 175 | 175 |
return -1; |
| 176 | 176 |
} |
| 177 | 177 |
|
| 178 |
s->data_offset = url_ftell(s->pb);
|
|
| 178 |
s->data_offset = avio_tell(s->pb);
|
|
| 179 | 179 |
av_dlog(s, "data offset %#llx\n", s->data_offset); |
| 180 | 180 |
if (url_is_streamed(s->pb)) |
| 181 | 181 |
return 0; |
| ... | ... | |
| 210 | 210 |
{
|
| 211 | 211 |
AVStream *st = s->streams[0]; |
| 212 | 212 |
int tmp, tmp2; |
| 213 |
uint64_t pos = url_ftell(s->pb);
|
|
| 213 |
uint64_t pos = avio_tell(s->pb);
|
|
| 214 | 214 |
unsigned dts; |
| 215 | 215 |
int ret; |
| 216 | 216 |
|
| ... | ... | |
| 241 | 241 |
tmp = avio_rb32(s->pb); |
| 242 | 242 |
av_dlog(s, "metadata len %d\n", tmp); |
| 243 | 243 |
} |
| 244 |
tmp = atom->size - 8 - (url_ftell(s->pb) - pos);
|
|
| 244 |
tmp = atom->size - 8 - (avio_tell(s->pb) - pos);
|
|
| 245 | 245 |
if (tmp < 0) |
| 246 | 246 |
return -1; |
| 247 | 247 |
ret = av_get_packet(s->pb, pkt, tmp); |
| ... | ... | |
| 264 | 264 |
{
|
| 265 | 265 |
AVStream *st = s->streams[1]; |
| 266 | 266 |
int tmp, tmp2, samples, size; |
| 267 |
uint64_t pos = url_ftell(s->pb);
|
|
| 267 |
uint64_t pos = avio_tell(s->pb);
|
|
| 268 | 268 |
unsigned dts; |
| 269 | 269 |
int ret; |
| 270 | 270 |
|
| ... | ... | |
| 287 | 287 |
tmp = avio_rb32(s->pb); // unknown |
| 288 | 288 |
av_dlog(s, "unknown %d\n", tmp); |
| 289 | 289 |
|
| 290 |
size = atom->size - 8 - (url_ftell(s->pb) - pos);
|
|
| 290 |
size = atom->size - 8 - (avio_tell(s->pb) - pos);
|
|
| 291 | 291 |
if (size < 0) |
| 292 | 292 |
return -1; |
| 293 | 293 |
ret = av_get_packet(s->pb, pkt, size); |
Also available in: Unified diff