[FFmpeg-cvslog] Merge commit '874838dc6589d978611c89a40694a5074f892a76'
Michael Niedermayer
git at videolan.org
Thu Nov 21 19:04:29 CET 2013
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Nov 21 18:48:48 2013 +0100| [a486dec4fd8f2d461ebec5b2744844916c28d383] | committer: Michael Niedermayer
Merge commit '874838dc6589d978611c89a40694a5074f892a76'
* commit '874838dc6589d978611c89a40694a5074f892a76':
fate: add one select filter test
Conflicts:
tests/fate/filter-video.mak
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=a486dec4fd8f2d461ebec5b2744844916c28d383
---
More information about the ffmpeg-cvslog
mailing list