Merge commit 'a58873b11198d04670b7f98f5a8a749d742db7c5'
authorJames Almer <jamrial@gmail.com>
Fri, 10 Nov 2017 23:23:43 +0000 (20:23 -0300)
committerJames Almer <jamrial@gmail.com>
Fri, 10 Nov 2017 23:24:37 +0000 (20:24 -0300)
commit09100ccc14690a9d781f055642b5b880752ee636
tree59af17f49b4a622c35c53e28b98dd4149fb6d227
parentfd352fadbbdf850e22c2bf87d8634cbc981976ef
parenta58873b11198d04670b7f98f5a8a749d742db7c5
Merge commit 'a58873b11198d04670b7f98f5a8a749d742db7c5'

* commit 'a58873b11198d04670b7f98f5a8a749d742db7c5':
  avconv: when using -loop option bail out if seek to start fails

Merged-by: James Almer <jamrial@gmail.com>
fftools/ffmpeg.c