[FFmpeg-cvslog] Merge commit '65d12900432ac880d764edbbd36818431484a76e'
Michael Niedermayer
git at videolan.org
Fri Oct 5 16:57:05 CEST 2012
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Oct 5 16:52:13 2012 +0200| [2a77d4f70b8b653ba405e6c01591bc402ab25a52] | committer: Michael Niedermayer
Merge commit '65d12900432ac880d764edbbd36818431484a76e'
* commit '65d12900432ac880d764edbbd36818431484a76e':
configure: add --enable-lto option
x86: cpu: Break out test for cpuid capabilities into separate function
x86: ff_get_cpu_flags_x86(): Avoid a pointless variable indirection
build: Factor out mpegaudio dependencies to CONFIG_MPEGAUDIO
segment: Add comments about calls that only are relevant for some muxers
segment: Add an option for omitting the first header and final trailer
Conflicts:
configure
libavcodec/Makefile
libavformat/segment.c
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=2a77d4f70b8b653ba405e6c01591bc402ab25a52
---
More information about the ffmpeg-cvslog
mailing list