Michael Niedermayer c6eee3120a Merge commit '35177ba77ff60a8b8839783f57e44bcc4214507a'
* commit '35177ba77ff60a8b8839783f57e44bcc4214507a':
  avconv: add support for DXVA2 decoding

Conflicts:
	Makefile
	configure

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-04-29 01:22:22 +02:00
..
2014-04-22 20:44:31 +02:00
2014-04-11 17:51:33 +02:00
2014-04-27 15:30:25 +02:00
2013-01-06 16:30:02 +01:00
2014-04-19 02:18:45 +02:00
2012-12-21 00:18:34 +01:00
2013-08-29 22:52:04 +02:00
2013-02-14 23:45:48 +01:00