diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-02-11 04:13:46 +0300 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-02-11 04:47:54 +0300 |
| commit | 2924514721bc32b500d6573899aed05cf6bbae67 (patch) | |
| tree | 84e8e77f392efe32c2fb03734fc6c29945180d40 /libavformat/r3d.c | |
| parent | b61170f51d2e4178b3e3e7f2961d4d191b7896e2 (diff) | |
| parent | 9deaec782810d098bca11c9332fab2d2f4c5fb78 (diff) | |
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/r3d.c')
| -rw-r--r-- | libavformat/r3d.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libavformat/r3d.c b/libavformat/r3d.c index 7a6f7a32f2..60e96bfbcd 100644 --- a/libavformat/r3d.c +++ b/libavformat/r3d.c @@ -185,8 +185,8 @@ static int r3d_read_header(AVFormatContext *s) return -1; } - s->data_offset = avio_tell(s->pb); - av_dlog(s, "data offset %#"PRIx64"\n", s->data_offset); + s->internal->data_offset = avio_tell(s->pb); + av_dlog(s, "data offset %#"PRIx64"\n", s->internal->data_offset); if (!s->pb->seekable) return 0; // find REOB/REOF/REOS to load index @@ -212,7 +212,7 @@ static int r3d_read_header(AVFormatContext *s) } out: - avio_seek(s->pb, s->data_offset, SEEK_SET); + avio_seek(s->pb, s->internal->data_offset, SEEK_SET); return 0; } |