[FFmpeg-cvslog] Merge commit 'acbe15a99f158dbb0edb837fb6557171dc4376d4'
Michael Niedermayer
git at videolan.org
Sun Mar 15 22:40:19 CET 2015
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sun Mar 15 22:20:15 2015 +0100| [96bd0321936bc8e0c4610a906832ef0b80061d06] | committer: Michael Niedermayer
Merge commit 'acbe15a99f158dbb0edb837fb6557171dc4376d4'
* commit 'acbe15a99f158dbb0edb837fb6557171dc4376d4':
fate: Add test for DCA XLL
Conflicts:
tests/fate/audio.mak
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=96bd0321936bc8e0c4610a906832ef0b80061d06
---
More information about the ffmpeg-cvslog
mailing list