diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-10-05 16:52:13 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-10-05 16:52:13 +0200 |
| commit | 2a77d4f70b8b653ba405e6c01591bc402ab25a52 (patch) | |
| tree | ac8c7eca3430b000bf861516f2fca09e8ea50d95 /ffmpeg.c | |
| parent | f74f8bc864b26cdbab606edcd6a401b4d1ca2700 (diff) | |
| parent | 65d12900432ac880d764edbbd36818431484a76e (diff) | |
| download | ffmpeg-2a77d4f70b8b653ba405e6c01591bc402ab25a52.tar.gz | |
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@gmx.at>
Diffstat (limited to 'ffmpeg.c')
0 files changed, 0 insertions, 0 deletions