Merge commit '16b0c929621f84983b83b9735ce973acb12723bc'
authorHendrik Leppkes <h.leppkes@gmail.com>
Wed, 14 Oct 2015 12:28:20 +0000 (14:28 +0200)
committerHendrik Leppkes <h.leppkes@gmail.com>
Wed, 14 Oct 2015 12:28:20 +0000 (14:28 +0200)
commit9ccd90626f0ecef205faef1d25f0e3649d18e1b3
tree8462ebe21f1e5ce5dc07d64f5174ca579d8d4897
parentb994788353ec39677d9f751da5cf754ef6247773
parent16b0c929621f84983b83b9735ce973acb12723bc
Merge commit '16b0c929621f84983b83b9735ce973acb12723bc'

* commit '16b0c929621f84983b83b9735ce973acb12723bc':
  avconv: Add loop option.

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