diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2011-12-16 04:23:15 +0400 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2011-12-16 04:23:15 +0400 |
commit | 175cc378b3bd970caf1641e5df3361d6233747e1 (patch) | |
tree | d237cb08b1b6909154a007d3c06f0dab61b9700f /configure | |
parent | 56669837ce18d15d757a144712a082b9cb535c94 (diff) | |
parent | d3b8bde2f14f78109a892e57f544bf840cf6d4fc (diff) |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
movenc: Rudimentary IODs support.
v410enc: fix output buffer size check
v410enc: include correct headers
fate: add -pix_fmt rgb48le to r210 test
flvenc: Support muxing 16 kHz nellymoser
configure: refactor list of programs into a variable
fate: add r210 decoder test
fate: split off Indeo FATE tests into their own file
fate: split off ATRAC FATE tests into their own file
fate: Add FATE tests for v410 encoder and decoder
ARM: fix external symbol refs in rv40 asm
westwood: Make sure audio header info is present when parsing audio packets
libgsm: Reset the MS mode of GSM in the flush function
libgsm: Set options on the right object
ARM: dca: disable optimised decode_blockcodes() for old gcc
Conflicts:
configure
libavformat/movenc.c
libavformat/movenc.h
tests/fate2.mak
tests/ref/acodec/alac
tests/ref/vsynth1/mpeg4
tests/ref/vsynth2/mpeg4
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'configure')
-rwxr-xr-x | configure | 21 |
1 files changed, 11 insertions, 10 deletions
@@ -978,8 +978,17 @@ COMPONENT_LIST=" protocols " +PROGRAM_LIST=" + avconv + ffplay + ffprobe + ffserver + ffmpeg +" + CONFIG_LIST=" $COMPONENT_LIST + $PROGRAM_LIST aandct ac3dsp avcodec @@ -994,11 +1003,6 @@ CONFIG_LIST=" dwt dxva2 fastdiv - ffmpeg - avconv - ffplay - ffprobe - ffserver fft frei0r gnutls @@ -1790,6 +1794,8 @@ target_os_default=$(tolower $(uname -s)) host_os=$target_os_default # configurable options +enable $PROGRAM_LIST + enable avcodec enable avdevice enable avfilter @@ -1800,11 +1806,6 @@ enable stripping enable swresample enable swscale -enable ffmpeg -enable ffplay -enable ffprobe -enable ffserver - enable asm enable debug enable doc |