[FFmpeg-cvslog] Merge commit '952f943d40e9dbcd68bc851460cc99268091a294'
Michael Niedermayer
git at videolan.org
Sun Nov 17 01:28:11 CET 2013
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sun Nov 17 01:20:45 2013 +0100| [10ac6f3ce9ae4065a5b72ddfaded45f75b357518] | committer: Michael Niedermayer
Merge commit '952f943d40e9dbcd68bc851460cc99268091a294'
* commit '952f943d40e9dbcd68bc851460cc99268091a294':
FATE: add a jv test
Conflicts:
tests/fate/video.mak
tests/ref/fate/jv
See: 7c52070131b7eb7f867fe1eab7383498814826df
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=10ac6f3ce9ae4065a5b72ddfaded45f75b357518
---
More information about the ffmpeg-cvslog
mailing list