diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-02-11 02:13:46 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-02-11 02:47:54 +0100 |
| commit | 2924514721bc32b500d6573899aed05cf6bbae67 (patch) | |
| tree | 84e8e77f392efe32c2fb03734fc6c29945180d40 /libavformat/asfdec.c | |
| parent | b61170f51d2e4178b3e3e7f2961d4d191b7896e2 (diff) | |
| parent | 9deaec782810d098bca11c9332fab2d2f4c5fb78 (diff) | |
| download | ffmpeg-2924514721bc32b500d6573899aed05cf6bbae67.tar.gz | |
Merge commit '9deaec782810d098bca11c9332fab2d2f4c5fb78'
* commit '9deaec782810d098bca11c9332fab2d2f4c5fb78':
lavf: move internal fields from public to internal context
Conflicts:
libavformat/avformat.h
libavformat/internal.h
libavformat/mux.c
libavformat/utils.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
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 c7d03f01f3..1b77f02ab4 100644 --- a/libavformat/asfdec.c +++ b/libavformat/asfdec.c @@ -909,7 +909,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) { @@ -1445,9 +1445,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; if (avio_seek(s->pb, pos, SEEK_SET) < 0) return AV_NOPTS_VALUE; @@ -1526,7 +1526,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) { @@ -1569,7 +1569,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; } |