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>

1 files changed, 5 insertions, 5 deletions

diff --git a/libavformat/mp3dec.c b/libavformat/mp3dec.c
index 519d046211..480cffedad 100644
--- a/libavformat/mp3dec.c
+++ b/libavformat/mp3dec.c
@@ -423,18 +423,18 @@ static int mp3_seek(AVFormatContext *s, int stream_index, int64_t timestamp,
 
     if (   mp3->is_cbr
         && st->duration > 0
-        && mp3->header_filesize > s->data_offset
+        && mp3->header_filesize > s->internal->data_offset
         && mp3->frames) {
         int64_t filesize = avio_size(s->pb);
         int64_t duration;
-        if (filesize <= s->data_offset)
+        if (filesize <= s->internal->data_offset)
             filesize = mp3->header_filesize;
-        filesize -= s->data_offset;
-        duration = av_rescale(st->duration, filesize, mp3->header_filesize - s->data_offset);
+        filesize -= s->internal->data_offset;
+        duration = av_rescale(st->duration, filesize, mp3->header_filesize - s->internal->data_offset);
         ie = &ie1;
         timestamp = av_clip64(timestamp, 0, duration);
         ie->timestamp = timestamp;
-        ie->pos       = av_rescale(timestamp, filesize, duration) + s->data_offset;
+        ie->pos       = av_rescale(timestamp, filesize, duration) + s->internal->data_offset;
     } else if (mp3->xing_toc) {
         if (ret < 0)
             return ret;