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/boadec.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/boadec.c')
| -rw-r--r-- | libavformat/boadec.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/libavformat/boadec.c b/libavformat/boadec.c index 45f6b3976b..be003e59c1 100644 --- a/libavformat/boadec.c +++ b/libavformat/boadec.c @@ -21,6 +21,7 @@ #include "libavutil/intreadwrite.h" #include "avformat.h" +#include "internal.h" static int probe(AVProbeData *p) { @@ -52,11 +53,11 @@ static int read_header(AVFormatContext *s) avio_rl32(s->pb); st->codec->sample_rate = avio_rl32(s->pb); st->codec->channels = avio_rl32(s->pb); - s->data_offset = avio_rl32(s->pb); + s->internal->data_offset = avio_rl32(s->pb); avio_r8(s->pb); st->codec->block_align = st->codec->channels * avio_rl32(s->pb); - avio_seek(s->pb, s->data_offset, SEEK_SET); + avio_seek(s->pb, s->internal->data_offset, SEEK_SET); return 0; } |