Merge commit '35177ba77ff60a8b8839783f57e44bcc4214507a'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 28 Apr 2014 23:06:58 +0000 (01:06 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 28 Apr 2014 23:22:22 +0000 (01:22 +0200)
commitc6eee3120a594cf25feb892f952a409a512d182e
treedfadf4547a680823f6805011d1bcf6077a9ce121
parent9c6eef6f5fcfaa67c0d9b01e44434e4c26538f96
parent35177ba77ff60a8b8839783f57e44bcc4214507a
Merge commit '35177ba77ff60a8b8839783f57e44bcc4214507a'

* commit '35177ba77ff60a8b8839783f57e44bcc4214507a':
  avconv: add support for DXVA2 decoding

Conflicts:
Makefile
configure

Merged-by: Michael Niedermayer <michaelni@gmx.at>
Changelog
Makefile
configure
doc/ffmpeg.texi
ffmpeg.h
ffmpeg_dxva2.c
ffmpeg_opt.c