[FFmpeg-cvslog] Merge commit '746ad4e0df7faf93329804e412ec53c1d929a75b'
Michael Niedermayer
git at videolan.org
Fri Jul 18 21:43:06 CEST 2014
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Jul 18 21:36:46 2014 +0200| [29119aff6cc7ebe6d3f46cc11cf91aaa4f37904b] | committer: Michael Niedermayer
Merge commit '746ad4e0df7faf93329804e412ec53c1d929a75b'
* commit '746ad4e0df7faf93329804e412ec53c1d929a75b':
dct-test: Improve CPU flags struct member name
Conflicts:
libavcodec/dct-test.c
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=29119aff6cc7ebe6d3f46cc11cf91aaa4f37904b
---
More information about the ffmpeg-cvslog
mailing list