[FFmpeg-cvslog] Merge commit '1d8a0c1b43e58332a3a15c67d4adc161713cade8'
Michael Niedermayer
git at videolan.org
Sat Nov 8 00:32:29 CET 2014
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Nov 7 23:59:57 2014 +0100| [2893d1b36d17f4a244ce84311b0ace541c7e1593] | committer: Michael Niedermayer
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 at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=2893d1b36d17f4a244ce84311b0ace541c7e1593
---
More information about the ffmpeg-cvslog
mailing list