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/oggdec.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/oggdec.c')
| -rw-r--r-- | libavformat/oggdec.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/libavformat/oggdec.c b/libavformat/oggdec.c index 8f146e49fe..3f152a4434 100644 --- a/libavformat/oggdec.c +++ b/libavformat/oggdec.c @@ -142,7 +142,7 @@ static int ogg_reset(AVFormatContext *s) os->segp = 0; os->incomplete = 0; os->got_data = 0; - if (start_pos <= s->data_offset) { + if (start_pos <= s->internal->data_offset) { os->lastpts = 0; } os->end_trimming = 0; @@ -520,8 +520,8 @@ static int ogg_packet(AVFormatContext *s, int *sid, int *dstart, int *dsize, // Update the header state for all streams and // compute the data_offset. - if (!s->data_offset) - s->data_offset = os->sync_pos; + if (!s->internal->data_offset) + s->internal->data_offset = os->sync_pos; for (i = 0; i < ogg->nstreams; i++) { struct ogg_stream *cur_os = ogg->streams + i; @@ -529,7 +529,7 @@ static int ogg_packet(AVFormatContext *s, int *sid, int *dstart, int *dsize, // if we have a partial non-header packet, its start is // obviously at or after the data start if (cur_os->incomplete) - s->data_offset = FFMIN(s->data_offset, cur_os->sync_pos); + s->internal->data_offset = FFMIN(s->internal->data_offset, cur_os->sync_pos); } } else { os->nb_header++; @@ -613,7 +613,7 @@ static int ogg_get_length(AVFormatContext *s) ogg_restore(s, 0); ogg_save (s); - avio_seek (s->pb, s->data_offset, SEEK_SET); + avio_seek (s->pb, s->internal->data_offset, SEEK_SET); ogg_reset(s); while (streams_left > 0 && !ogg_packet(s, &i, NULL, NULL, NULL)) { int64_t pts; |