[FFmpeg-cvslog] Merge commit 'ea15a9a5d8fa6a71af3101b2af18c4dcac07987f'
Michael Niedermayer
git at videolan.org
Sat Mar 1 13:52:41 CET 2014
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sat Mar 1 13:47:08 2014 +0100| [0bb474f686fb33ef731e34972e48b82dfbf82984] | committer: Michael Niedermayer
Merge commit 'ea15a9a5d8fa6a71af3101b2af18c4dcac07987f'
* commit 'ea15a9a5d8fa6a71af3101b2af18c4dcac07987f':
qt-faststart: Simplify code by using a MIN() macro
Conflicts:
tools/qt-faststart.c
See: 59003fe7c064e98359cce83b1b727fb1026bdf12
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=0bb474f686fb33ef731e34972e48b82dfbf82984
---
More information about the ffmpeg-cvslog
mailing list