Changeset 3c058f57 in ffmpeg
- Timestamp:
-
Jul 13, 2016, 2:34:54 PM
(8 years ago)
- Author:
- Matthieu Bouron <matthieu.bouron@stupeflix.com>
- Branches:
- master
- Children:
- 35433649
- Parents:
- f2b08a07 (diff), 7672997 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
- git-author:
- Matthieu Bouron <matthieu.bouron@stupeflix.com> (07/13/16 14:34:39)
- git-committer:
- Matthieu Bouron <matthieu.bouron@stupeflix.com> (07/13/16 14:34:54)
- Message:
-
Merge commit '76729970049fe95659346503f7401a5d869f9959'
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>
-
(No files)
-
