RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
65,511 Commits 37 Branches 400 Tags 271 MiB
Commit Graph

3 Commits

Author SHA1 Message Date
Michael Niedermayer 5b393766ba Merge commit 'a7c5fddac8137654cb503295c4dfb6492df43643' 
* commit 'a7c5fddac8137654cb503295c4dfb6492df43643':
  avconv_dxva2: define all used GUIDs directly instead of relying on the dxva2api.h header

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-04-30 00:46:38 +02:00
Michael Niedermayer 648f7a6ec5 ffmpeg_dxva2: fix mixing of declarations and statements 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-04-29 01:54:42 +02:00
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