[FFmpeg-cvslog] Merge commit '0e083d7e43805db1a978cb57bfa25fda62e8ff18'
Michael Niedermayer
git at videolan.org
Thu Mar 20 22:27:20 CET 2014
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Mar 20 22:21:08 2014 +0100| [011d83de488d2051c485a1618dda0a43d77bcbc7] | committer: Michael Niedermayer
Merge commit '0e083d7e43805db1a978cb57bfa25fda62e8ff18'
* commit '0e083d7e43805db1a978cb57bfa25fda62e8ff18':
build: Group general components separate from de/encoders in arch Makefiles
Conflicts:
libavcodec/arm/Makefile
libavcodec/x86/Makefile
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=011d83de488d2051c485a1618dda0a43d77bcbc7
---
More information about the ffmpeg-cvslog
mailing list