diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-09-11 23:33:25 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-09-11 23:33:34 +0200 |
| commit | 507c0416cd392802530de8f2c3b362f667c7fbdc (patch) | |
| tree | 03c754ebe531f18f8ada74365d1d8f0ff5177629 /configure | |
| parent | 578bbf8149fcb0ae98055e67e6ab92f23384e6fe (diff) | |
| parent | cdea19e75a1854748a55e5a1a09b53cc4bf789c5 (diff) | |
| download | ffmpeg-507c0416cd392802530de8f2c3b362f667c7fbdc.tar.gz | |
Merge remote-tracking branch 'cus/stable'
* cus/stable:
ffplay: increase sample array buffer
configure: add crop filter as ffplay requirement
ffplay: ensure that pictq_prev_picture never fills the picture queue
ffplay: simplify picture allocation
ffplay: make initial window size calculation based on aspect ratio
ffplay: factor display rectangle calculation to its own function
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'configure')
| -rwxr-xr-x | configure | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -1927,7 +1927,7 @@ ffmpeg_deps="avcodec avfilter avformat swscale swresample" ffmpeg_select="ffbuffersink_filter format_filter aformat_filter setpts_filter null_filter anull_filter ffabuffersink_filter" ffplay_deps="avcodec avformat swscale swresample sdl" -ffplay_select="ffbuffersink_filter rdft" +ffplay_select="ffbuffersink_filter rdft crop_filter" ffprobe_deps="avcodec avformat" ffserver_deps="avformat ffm_muxer fork rtp_protocol rtsp_demuxer" ffserver_extralibs='$ldl' |