Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 20 Aug 2011 13:43:53 +0000 (15:43 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 20 Aug 2011 13:43:56 +0000 (15:43 +0200)
commitf138c7f993e1aaf5223c546da5292993a467ee8d
treea56e5036fcfb3ebc8f92dddf558e65c0fcb76301
parent4b66c8b42589adfb34294d869e58adabe1491138
parentf5bae2c6ed855f528d68ddab1cad080bcc271440
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>
avconv.c
doc/avconv.texi