diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-08-20 15:43:53 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-08-20 15:43:56 +0200 |
| commit | f138c7f993e1aaf5223c546da5292993a467ee8d (patch) | |
| tree | a56e5036fcfb3ebc8f92dddf558e65c0fcb76301 /libavfilter/avfilter.h | |
| parent | 4b66c8b42589adfb34294d869e58adabe1491138 (diff) | |
| parent | f5bae2c6ed855f528d68ddab1cad080bcc271440 (diff) | |
| download | ffmpeg-f138c7f993e1aaf5223c546da5292993a467ee8d.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
doc/avconv: replace forgotten av by avconv.
avconv: reset input_ts_offset between files.
doc/avconv: extend -ss documentation.
avconv: call flush_encoders() from transcode() directly.
avconv: fix broken indentation.
avconv: rescue poor abused limit_filesize global.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavfilter/avfilter.h')
0 files changed, 0 insertions, 0 deletions