diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-10-12 23:26:28 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-10-13 01:02:36 +0200 |
| commit | ca5a77191b79e8ff46402e2db6f1bf18d034f9e8 (patch) | |
| tree | 90cfc948923c0b3e2fec53567001e6af5b0e777a /libavutil/aes.h | |
| parent | ccd04f43201d1a147dcb60bf6290c879d59fec37 (diff) | |
| parent | dbb472cb2f2f799295a12b4922a6a8be2cccfdee (diff) | |
| download | ffmpeg-ca5a77191b79e8ff46402e2db6f1bf18d034f9e8.tar.gz | |
Merge commit 'dbb472cb2f2f799295a12b4922a6a8be2cccfdee'
* commit 'dbb472cb2f2f799295a12b4922a6a8be2cccfdee':
movenc: Write edit lists for fragmented files as well, if necessary
Conflicts:
libavformat/movenc.c
The default for writing EDTS for fragmented mp4 is left at disabled
this can be overridden via command line with -use_editlist
but EDTS + fragments still does not fully work, which is why it is
left disabled by default
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavutil/aes.h')
0 files changed, 0 insertions, 0 deletions