diff options
| author | Hendrik Leppkes <h.leppkes@gmail.com> | 2016-11-14 12:41:32 +0100 |
|---|---|---|
| committer | Hendrik Leppkes <h.leppkes@gmail.com> | 2016-11-14 12:41:32 +0100 |
| commit | d8ffdefbdce16948c9b3c84df62171a7d58c8253 (patch) | |
| tree | 7f94fd01a78c251e7a5b42e9f8f285bb3f526b7d | |
| parent | 985bc8b49683761e5014a22146d4346c951680ad (diff) | |
| parent | 029cf99c5166b36f33381cd8ebfa5f1f1f463d1f (diff) | |
| download | ffmpeg-d8ffdefbdce16948c9b3c84df62171a7d58c8253.tar.gz | |
Merge commit '029cf99c5166b36f33381cd8ebfa5f1f1f463d1f'
* commit '029cf99c5166b36f33381cd8ebfa5f1f1f463d1f':
mov: Save number of stsd elements after stream extradata allocation
Mostly noop, see 8b43ee4054af799e388d380b379a13a60849c1b5
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
| -rw-r--r-- | libavformat/mov.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/libavformat/mov.c b/libavformat/mov.c index 17d63d66d0..8d6cc12bac 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -2332,8 +2332,7 @@ static int mov_read_stsd(MOVContext *c, AVIOContext *pb, MOVAtom atom) { AVStream *st; MOVStreamContext *sc; - int ret; - int entries; + int ret, entries; if (c->fc->nb_streams < 1) return 0; @@ -2342,7 +2341,7 @@ static int mov_read_stsd(MOVContext *c, AVIOContext *pb, MOVAtom atom) avio_r8(pb); /* version */ avio_rb24(pb); /* flags */ - entries = avio_rb32(pb); /* entries */ + entries = avio_rb32(pb); if (entries <= 0) { av_log(c->fc, AV_LOG_ERROR, "invalid STSD entries %d\n", entries); |