diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-03-31 01:55:58 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-03-31 01:58:14 +0200 |
| commit | 1ffbaa88c92b53e72dc4628e35e1f7c39819f31e (patch) | |
| tree | 8385279cc32ef36e1164c9a96688197faaa24061 /libavformat/mov.c | |
| parent | 20bc5924a0caadd39e3906301754f4557e29a7fa (diff) | |
| parent | fce28c3c6d603b7f42a5dbe36bf240d0470469c8 (diff) | |
| download | ffmpeg-1ffbaa88c92b53e72dc4628e35e1f7c39819f31e.tar.gz | |
Merge commit 'fce28c3c6d603b7f42a5dbe36bf240d0470469c8'
* commit 'fce28c3c6d603b7f42a5dbe36bf240d0470469c8':
mov: fill in subtitle dimensions after parsing tkhd
See: 8ba432bc56f2d3ef534be7d3ccc1c9b3c0ea3091
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/mov.c')
| -rw-r--r-- | libavformat/mov.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libavformat/mov.c b/libavformat/mov.c index 469da94934..75a05b85ef 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -3414,8 +3414,9 @@ static int mov_read_header(AVFormatContext *s) { MOVContext *mov = s->priv_data; AVIOContext *pb = s->pb; - int i, j, err; + int j, err; MOVAtom atom = { AV_RL32("root") }; + int i; mov->fc = s; /* .mov and .mp4 aren't streamable anyway (only progressive download if moov is before mdat) */ |