[FFmpeg-cvslog] Merge commit '5dcc201505f71b1e73e9eef12ce89d4eed252ad0'
Michael Niedermayer
git at videolan.org
Sat Jul 19 14:10:13 CEST 2014
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sat Jul 19 13:56:08 2014 +0200| [776647360db37628ccfcaf9a624544b2be45eb7a] | committer: Michael Niedermayer
Merge commit '5dcc201505f71b1e73e9eef12ce89d4eed252ad0'
* commit '5dcc201505f71b1e73e9eef12ce89d4eed252ad0':
simple_idct: Move x86-specific declarations to a header in the x86 directory
Conflicts:
libavcodec/x86/simple_idct.c
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=776647360db37628ccfcaf9a624544b2be45eb7a
---
More information about the ffmpeg-cvslog
mailing list