Merge commit 'fb472e1a11a4e0caed2c3c91da01ea8e35d9e3f8'
authorHendrik Leppkes <h.leppkes@gmail.com>
Thu, 22 Oct 2015 14:18:02 +0000 (16:18 +0200)
committerHendrik Leppkes <h.leppkes@gmail.com>
Thu, 22 Oct 2015 14:18:02 +0000 (16:18 +0200)
commitdd8a4b0f8c39803b6a33f4b4bc836cfc66222370
tree32fb5e4b29968caef33ecd449d25288604556dfc
parent866a4174dba066780c7be1ebdaa0152161cdf3e0
parentfb472e1a11a4e0caed2c3c91da01ea8e35d9e3f8
Merge commit 'fb472e1a11a4e0caed2c3c91da01ea8e35d9e3f8'

* commit 'fb472e1a11a4e0caed2c3c91da01ea8e35d9e3f8':
  avconv: add support for Intel QSV-accelerated transcoding

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