diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2012-01-12 03:52:40 +0400 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2012-01-12 04:10:32 +0400 |
commit | 794006f8fe403ccd2993513a8e4fbe885ef7f9fb (patch) | |
tree | 42edca40fc6f5ba24543f611086891ae4c6b6f68 /cmdutils.c | |
parent | 4093d130d1934edcd098014d306492173527f1f6 (diff) | |
parent | e7d02b04dcfb65d1873b81bd3281442ac5ddec1d (diff) |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
fft: init functions with INIT_XMM/YMM.
pcmenc: set frame_size to 0.
gsm demuxer: use generic seeking instead of a gsm-specific function.
gsm demuxer: return packets with only 1 gsm block at a time.
avcodec: add GSM parser
doc: Replace ffmpeg references in avserver config file by avconv.
doc: Fix names of av_log color environment variables.
Fix a bunch of platform name and other typos.
Add some missing changelog entries and release 0.8_beta2
No longer build libpostproc by default
wtv: fix memleaks during normal operation
threads: add CODEC_CAP_AUTO_THREADS for libvpx and xavs
Conflicts:
Changelog
RELEASE
cmdutils.c
configure
doc/ffserver.conf
doc/platform.texi
ffplay.c
libavcodec/Makefile
libavcodec/version.h
libavformat/wtv.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'cmdutils.c')
-rw-r--r-- | cmdutils.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/cmdutils.c b/cmdutils.c index 36e472a705..344e506897 100644 --- a/cmdutils.c +++ b/cmdutils.c @@ -34,7 +34,9 @@ #include "libavdevice/avdevice.h" #include "libswscale/swscale.h" #include "libswresample/swresample.h" +#if CONFIG_POSTPROC #include "libpostproc/postprocess.h" +#endif #include "libavutil/avstring.h" #include "libavutil/mathematics.h" #include "libavutil/parseutils.h" @@ -607,7 +609,9 @@ static void print_all_libs_info(int flags, int level) PRINT_LIB_INFO(avfilter, AVFILTER, flags, level); PRINT_LIB_INFO(swscale, SWSCALE, flags, level); PRINT_LIB_INFO(swresample,SWRESAMPLE, flags, level); +#if CONFIG_POSTPROC PRINT_LIB_INFO(postproc, POSTPROC, flags, level); +#endif } static void print_program_info(int flags, int level) |