diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-05-30 03:32:32 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-05-30 04:38:32 +0200 |
| commit | 16e25ef34b375dbc6789b6b0da7d077c1dcefe88 (patch) | |
| tree | cd2b27d2a0c185192c1202f0aaa7979c760ed6a1 /configure | |
| parent | b0387edd5e766b1032f946d6cdb35b765bb45435 (diff) | |
| parent | c9cc76290f8139a012a12efe7e581276b8bd8dff (diff) | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
avconv: extend -r to work on any input stream.
doc/avconv: expand documentation for the -s option.
avconv: don't print filters inserted by avconv in stream mappings.
avconv: merge configuration code for complex and simple filters
avconv: split configuring input filters out of configure_complex_filter
Conflicts:
configure
doc/ffmpeg.texi
ffmpeg.c
tests/ref/fate/idroq-video-encode
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'configure')
| -rwxr-xr-x | configure | 5 |
1 files changed, 3 insertions, 2 deletions
@@ -1709,13 +1709,14 @@ avformat_deps="avcodec" postproc_deps="gpl" # programs +ffmpeg_deps="avcodec avfilter avformat swscale swresample + setpts_filter" +ffmpeg_select="buffersink_filter format_filter aformat_filter" ffplay_deps="avcodec avformat swscale swresample sdl" ffplay_select="buffersink_filter rdft" ffprobe_deps="avcodec avformat" ffserver_deps="avformat ffm_muxer fork rtp_protocol rtsp_demuxer" ffserver_extralibs='$ldl' -ffmpeg_deps="avcodec avfilter avformat swscale swresample" -ffmpeg_select="buffersink_filter format_filter aformat_filter" doc_deps="texi2html" |