[FFmpeg-cvslog] Merge commit '4f8cf0dc4ef6110174056df7edd9dc2f2a988b6d'
Michael Niedermayer
git at videolan.org
Tue Jul 29 00:40:02 CEST 2014
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Jul 29 00:34:53 2014 +0200| [a91c5ed008740fabdb910a59db9e5792b6574486] | committer: Michael Niedermayer
Merge commit '4f8cf0dc4ef6110174056df7edd9dc2f2a988b6d'
* commit '4f8cf0dc4ef6110174056df7edd9dc2f2a988b6d':
x86: build: Restore ordering of OBJS lines
Conflicts:
libavcodec/x86/Makefile
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=a91c5ed008740fabdb910a59db9e5792b6574486
---
More information about the ffmpeg-cvslog
mailing list