[FFmpeg-cvslog] Merge commit '6289706b35d1b030258bba54cc27bb6d2c04bc9b'
Michael Niedermayer
git at videolan.org
Tue Mar 17 22:06:20 CET 2015
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Mar 17 21:58:16 2015 +0100| [ae3d2afd46806531c30b0e343963ade09220148d] | committer: Michael Niedermayer
Merge commit '6289706b35d1b030258bba54cc27bb6d2c04bc9b'
* commit '6289706b35d1b030258bba54cc27bb6d2c04bc9b':
fate: Move tdsc to the appropriate screen capture file
Conflicts:
tests/fate/video.mak
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=ae3d2afd46806531c30b0e343963ade09220148d
---
More information about the ffmpeg-cvslog
mailing list