diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-03-06 20:54:41 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-03-06 20:57:11 +0100 |
| commit | 1468ff49dfdeaf8e69cb640a326c95ba049c9c98 (patch) | |
| tree | b6f55a90d0d00c15fe8a66bf35987e372a7c3fc5 /doc/swresample.txt | |
| parent | 70082a1e533deed6688938232e6e66abbd62b0fa (diff) | |
| parent | 9731cf4001377fa2f75c279072cc2b0cbd57bf8e (diff) | |
| download | ffmpeg-1468ff49dfdeaf8e69cb640a326c95ba049c9c98.tar.gz | |
Merge commit '9731cf4001377fa2f75c279072cc2b0cbd57bf8e'
* commit '9731cf4001377fa2f75c279072cc2b0cbd57bf8e':
movenc: Keep writing zero-entry stts atoms as intended
Conflicts:
libavformat/movenc.c
See: 95165f7c1b533c121b890fa1e82e8ed596cfc108
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'doc/swresample.txt')
0 files changed, 0 insertions, 0 deletions