[FFmpeg-cvslog] Merge commit '16b7328058fa600d5158c84d9cc621a134eb88bc'
Michael Niedermayer
git at videolan.org
Mon Jul 21 22:21:53 CEST 2014
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Jul 21 22:02:23 2014 +0200| [9a436ae30f10614e74fa4e1a561ce91cb0b2dd77] | committer: Michael Niedermayer
Merge commit '16b7328058fa600d5158c84d9cc621a134eb88bc'
* commit '16b7328058fa600d5158c84d9cc621a134eb88bc':
build: Conditionally build and run DCT test program
Conflicts:
libavcodec/Makefile
libavcodec/dct-test.c
tests/fate/libavcodec.mak
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=9a436ae30f10614e74fa4e1a561ce91cb0b2dd77
---
More information about the ffmpeg-cvslog
mailing list