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

1 Commits

Author SHA1 Message Date
Michael Niedermayer 3e641b4842 Merge commit '7671dd7cd7d51bbd637cc46d8f104a141bc355ea' 
* commit '7671dd7cd7d51bbd637cc46d8f104a141bc355ea':
  avconv: add support for VDPAU decoding

Conflicts:
	Changelog
	Makefile
	configure
	ffmpeg.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-23 14:46:48 +01:00