Stowage/ffmpeg
2
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-12-08 06:09:50 +00:00
Code Issues Projects Releases Packages Wiki Activity
64503 commits 38 branches 415 tags 263 MiB
Commit graph

3 commits

Author SHA1 Message Date
Michael Niedermayer
5b393766ba Merge commit 'a7c5fddac8' 
* commit 'a7c5fddac8':
  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 '35177ba77f' 
* commit '35177ba77f':
  avconv: add support for DXVA2 decoding

Conflicts:
	Makefile
	configure

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-04-29 01:22:22 +02:00