diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-05-10 04:01:29 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-05-10 04:03:17 +0200 |
| commit | b97b4b58a6e1ac595002b3e3f3469161771c6003 (patch) | |
| tree | 8c2833931fb16084f95bf0adf8317e1fa28aca12 /configure | |
| parent | 67d441499a042edcfb0f8a120e6196d10b1d13db (diff) | |
| parent | a88ef93b4abbea9f18c8750113dc9e99931f2f8a (diff) | |
| download | ffmpeg-b97b4b58a6e1ac595002b3e3f3469161771c6003.tar.gz | |
Merge remote branch 'qatar/master'
* qatar/master:
mpegaudiodec: group #includes more sanely
mpegaudio: remove #if 0 blocks
ffmpeg.c: reset avoptions after each input/output file.
ffmpeg.c: store per-output stream sws flags.
mpegaudio: remove CONFIG_MPEGAUDIO_HP option
mpegtsenc: Clear st->priv_data when freeing it
udp: Fix receiving RTP data over multicast
rtpproto: Remove an unused variable
regtest: fix wma tests
NOT pulled: mpegaudio: remove CONFIG_AUDIO_NONSHORT
regtest: separate flags for encoding and decoding
Conflicts:
ffmpeg.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'configure')
| -rwxr-xr-x | configure | 3 |
1 files changed, 0 insertions, 3 deletions
@@ -94,7 +94,6 @@ Configuration options: --enable-w32threads use Win32 threads [no] --enable-x11grab enable X11 grabbing [no] --disable-network disable network support [no] - --disable-mpegaudio-hp faster (but less accurate) MPEG audio decoding [no] --enable-gray enable full grayscale support (slower color) --disable-swscale-alpha disable alpha channel support in swscale --disable-fastdiv disable table-based division @@ -957,7 +956,6 @@ CONFIG_LIST=" mdct memalign_hack mlib - mpegaudio_hp network nonfree pic @@ -1667,7 +1665,6 @@ enable ffmpeg enable ffplay enable ffprobe enable ffserver -enable mpegaudio_hp enable network enable optimizations enable protocols |