Merge commit 'bce70f8170592599a4f2f5f02606c1246e88df57'

* commit 'bce70f8170592599a4f2f5f02606c1246e88df57': configure: make avconv select (a)trim filters Conflicts: configure Merged-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago · bf0547504b
parent 42f5fc716e bce70f8170
commit bf0547504b
1 changed files with 3 additions and 2 deletions
--- a/5
+++ b/5
@ -2178,8 +2178,9 @@ swscale_deps="avutil"

 # programs
 ffmpeg_deps="avcodec avfilter avformat swscale swresample"
-ffmpeg_select="format_filter aformat_filter
-               setpts_filter null_filter anull_filter"
+ffmpeg_select="aformat_filter anull_filter atrim_filter format_filter
+               null_filter
+               setpts_filter trim_filter"
 ffplay_deps="avcodec avformat swscale swresample sdl"
 ffplay_select="rdft crop_filter"
 ffprobe_deps="avcodec avformat"