]> git.sesse.net Git - ffmpeg/commitdiff
projects / ffmpeg / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: db854c6 bd31c61)
Merge commit 'bd31c61cf94d01dbe1051cf65874e7b2c0ac5454'
authorHendrik Leppkes <h.leppkes@gmail.com>
Sun, 13 Nov 2016 16:33:31 +0000 (17:33 +0100)
committerHendrik Leppkes <h.leppkes@gmail.com>
Sun, 13 Nov 2016 16:33:31 +0000 (17:33 +0100)
* commit 'bd31c61cf94d01dbe1051cf65874e7b2c0ac5454':
  avconv: Remove hw_device_ctx output filter reinit hack

Noop, since our hwaccel infrastructure still requires this.

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>

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