diff options
| author | wm4 <nfxjfg@googlemail.com> | 2015-02-06 14:53:40 +0100 |
|---|---|---|
| committer | Anton Khirnov <anton@khirnov.net> | 2015-02-10 21:45:04 +0100 |
| commit | 9deaec782810d098bca11c9332fab2d2f4c5fb78 (patch) | |
| tree | 09de732f0e2550abd520cb94d80e3882546548f2 /libavformat/asfdec.c | |
| parent | 1509c018bd5b054a2354e20021ccbac9c934d213 (diff) | |
lavf: move internal fields from public to internal context
This is not an API change; the fields were explicitly declared private
before.
Signed-off-by: Anton Khirnov <anton@khirnov.net>
Diffstat (limited to 'libavformat/asfdec.c')
| -rw-r--r-- | libavformat/asfdec.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/libavformat/asfdec.c b/libavformat/asfdec.c index 85e800d501..5c23170c05 100644 --- a/libavformat/asfdec.c +++ b/libavformat/asfdec.c @@ -878,7 +878,7 @@ static int asf_get_packet(AVFormatContext *s, AVIOContext *pb) if (asf->no_resync_search) off = 3; else if (s->packet_size > 0) - off = (avio_tell(pb) - s->data_offset) % s->packet_size + 3; + off = (avio_tell(pb) - s->internal->data_offset) % s->packet_size + 3; c = d = e = -1; while (off-- > 0) { @@ -1361,9 +1361,9 @@ static int64_t asf_read_pts(AVFormatContext *s, int stream_index, start_pos[i] = pos; if (s->packet_size > 0) - pos = (pos + s->packet_size - 1 - s->data_offset) / + pos = (pos + s->packet_size - 1 - s->internal->data_offset) / s->packet_size * s->packet_size + - s->data_offset; + s->internal->data_offset; *ppos = pos; avio_seek(s->pb, pos, SEEK_SET); @@ -1437,7 +1437,7 @@ static int asf_build_simple_index(AVFormatContext *s, int stream_index) for (i = 0; i < ict; i++) { int pktnum = avio_rl32(s->pb); int pktct = avio_rl16(s->pb); - int64_t pos = s->data_offset + s->packet_size * (int64_t)pktnum; + int64_t pos = s->internal->data_offset + s->packet_size * (int64_t)pktnum; int64_t index_pts = FFMAX(av_rescale(itime, i, 10000) - asf->hdr.preroll, 0); if (pos != last_pos) { @@ -1480,7 +1480,7 @@ static int asf_read_seek(AVFormatContext *s, int stream_index, /* explicitly handle the case of seeking to 0 */ if (!pts) { asf_reset_header(s); - avio_seek(s->pb, s->data_offset, SEEK_SET); + avio_seek(s->pb, s->internal->data_offset, SEEK_SET); return 0; } |