generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
c9c4835f51
ffmpeg/tests/ref/fate/idroq-video-encode

2 lines
33 B
Plaintext
Raw Normal View History

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>
2012-05-30 03:32:32 +02:00
736168b00f6b79f472a57bf47b587c8c
Reference in New Issue Copy Permalink