]> git.sesse.net Git - ffmpeg/commitdiff
projects / ffmpeg / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 9393458 69a6380)
Merge commit '69a638019fc0db4c2b75b36ef45d0acb6d2e9628'
authorDerek Buitenhuis <derek.buitenhuis@gmail.com>
Sun, 8 May 2016 21:50:42 +0000 (22:50 +0100)
committerDerek Buitenhuis <derek.buitenhuis@gmail.com>
Sun, 8 May 2016 21:50:46 +0000 (22:50 +0100)
* commit '69a638019fc0db4c2b75b36ef45d0acb6d2e9628':
  avconv: fix -frames for video

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

Trivial merge
Unnamed repository; edit this file 'description' to name the repository.