ffmpeg | branch: master | Michael Niedermayer <[email protected]> | 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 <[email protected]>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=ae3d2afd46806531c30b0e343963ade09220148d
---
_______________________________________________
ffmpeg-cvslog mailing list
[email protected]
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog