mirror of
https://git.ffmpeg.org/ffmpeg.git
synced 2024-10-01 18:51:01 +00:00
16e25ef34b
* 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>
2 lines
33 B
Plaintext
2 lines
33 B
Plaintext
736168b00f6b79f472a57bf47b587c8c
|