diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-11-07 23:59:57 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-11-08 00:22:42 +0100 |
| commit | 2893d1b36d17f4a244ce84311b0ace541c7e1593 (patch) | |
| tree | f1d9b10bac2a67fe30f5d0bbde61192415a93bd0 /libavcodec/pthread_slice.c | |
| parent | 0d71e825dbb36a61c47a9f7847fa240700791430 (diff) | |
| parent | 1d8a0c1b43e58332a3a15c67d4adc161713cade8 (diff) | |
| download | ffmpeg-2893d1b36d17f4a244ce84311b0ace541c7e1593.tar.gz | |
Merge commit '1d8a0c1b43e58332a3a15c67d4adc161713cade8'
* commit '1d8a0c1b43e58332a3a15c67d4adc161713cade8':
movenc: Allow to request not to use edit lists
Conflicts:
libavformat/movenc.c
See: 537ef8bebf8a35aab448db6ec876e275a10f0f15
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/pthread_slice.c')
0 files changed, 0 insertions, 0 deletions