diff options
author | Clément Bœsch <u@pkh.me> | 2017-03-12 13:08:04 +0100 |
---|---|---|
committer | Clément Bœsch <u@pkh.me> | 2017-03-12 13:08:04 +0100 |
commit | 993a9a3d72af4f4a07470570bc472a0d385ca78f (patch) | |
tree | 761e895d1d4cdb326bfc0b20a089a52847b04f94 /configure | |
parent | 807d5dcde9d83dca48f8dfc5c98bbc2be6fdc61c (diff) | |
parent | b0f36a0043d76436cc7ab8ff92ab99c94595d3c0 (diff) |
Merge commit 'b0f36a0043d76436cc7ab8ff92ab99c94595d3c0'
* commit 'b0f36a0043d76436cc7ab8ff92ab99c94595d3c0':
avconv: stop using setpts for input framerate forced with -r
Merged-by: Clément Bœsch <u@pkh.me>
Diffstat (limited to 'configure')
-rwxr-xr-x | configure | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -3192,7 +3192,7 @@ swscale_deps="avutil" ffmpeg_deps="avcodec avfilter avformat swresample" ffmpeg_select="aformat_filter anull_filter atrim_filter format_filter null_filter - setpts_filter trim_filter" + trim_filter" ffplay_deps="avcodec avformat swscale swresample sdl2" ffplay_libs='$sdl2_libs' ffplay_select="rdft crop_filter transpose_filter hflip_filter vflip_filter rotate_filter" |