[FFmpeg-cvslog] Merge commit 'bd31c61cf94d01dbe1051cf65874e7b2c0ac5454'

[Hendrik Leppkes]

ffmpeg | branch: master | Hendrik Leppkes <h.leppkes at gmail.com> | Sun Nov 13 17:33:31 2016 +0100| [c17563c5d3c974a69709ebae0171534763b3051c] | committer: Hendrik Leppkes

Merge commit 'bd31c61cf94d01dbe1051cf65874e7b2c0ac5454'

* 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 at gmail.com>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=c17563c5d3c974a69709ebae0171534763b3051c
---