diff options
author | Matthieu Bouron <matthieu.bouron@stupeflix.com> | 2016-07-13 16:34:39 +0200 |
---|---|---|
committer | Matthieu Bouron <matthieu.bouron@stupeflix.com> | 2016-07-13 16:34:54 +0200 |
commit | 3c058f570128dcfa3a68f0860e2be7f098e8d6e1 (patch) | |
tree | 72f1ca0c89d5169ff4123b1e3af60f35b99c8bfb /libavformat/tls_gnutls.c | |
parent | f2b08a07028ebf6511929ed4f5f55a4479d4f825 (diff) | |
parent | 76729970049fe95659346503f7401a5d869f9959 (diff) | |
download | ffmpeg-3c058f570128dcfa3a68f0860e2be7f098e8d6e1.tar.gz |
Merge commit '76729970049fe95659346503f7401a5d869f9959'
* commit '76729970049fe95659346503f7401a5d869f9959':
mov: Implement support for multiple sample description tables
Notes:
* The sc->stsc_data[index].id checks have been moved from the mov_read_stsc
to mov_read_packet before the value is used in mov_change_extradata to
not break playback of samples with broken stsc entries (see sample of
ticket #1918).
* sc->stsc_index is now checked against sc->stsc_count - 1 before it
is incremented so it remains lesser than sc->stsc_count. Fixes a crash
with:
./ffmpeg -i matrixbench_mpeg2.mpg -t 1 -frag_duration 200k test.mov
./ffprobe -show_packets test.mov
Merged-by: Matthieu Bouron <matthieu.bouron@stupeflix.com>
Diffstat (limited to 'libavformat/tls_gnutls.c')
0 files changed, 0 insertions, 0 deletions