Merge commit 'cd0e08813a0484002b5defbf557c859f123953ae'
authorHendrik Leppkes <h.leppkes@gmail.com>
Thu, 29 Oct 2015 13:21:41 +0000 (14:21 +0100)
committerHendrik Leppkes <h.leppkes@gmail.com>
Thu, 29 Oct 2015 13:21:41 +0000 (14:21 +0100)
commit9f7de9951790ca86321dccd9705e463f5310958b
tree6acf2534a5fdbfdcdbf6e18d38fbca9a9790f6ee
parent3ec049b85dacdb5e3f598e4ddab87b1d5a877783
parentcd0e08813a0484002b5defbf557c859f123953ae
Merge commit 'cd0e08813a0484002b5defbf557c859f123953ae'

* commit 'cd0e08813a0484002b5defbf557c859f123953ae':
  avconv: support infinite loop for the loop option

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
doc/ffmpeg.texi
ffmpeg.c