[FFmpeg-cvslog] Merge commit '24f45c16224d4c5d482e928676714766ffdda4fc'
Michael Niedermayer
git at videolan.org
Fri Jun 27 02:42:12 CEST 2014
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Jun 27 02:36:45 2014 +0200| [5a636383db9b199932576c3767cb44c958bc11db] | committer: Michael Niedermayer
Merge commit '24f45c16224d4c5d482e928676714766ffdda4fc'
* commit '24f45c16224d4c5d482e928676714766ffdda4fc':
fate: Add dependencies for dct/fft/mdct/rdft tests
Conflicts:
libavcodec/fft-test.c
tests/fate/fft.mak
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=5a636383db9b199932576c3767cb44c958bc11db
---
More information about the ffmpeg-cvslog
mailing list