virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity
85,334 Commits 37 Branches 400 Tags 465 MiB
b8f26779d6
Commit Graph

10 Commits

Author SHA1 Message Date
Hendrik Leppkes
844256740d Merge commit 'f72db3f2f3a8c83a4f5dede8fa03434b2bf676c6' 
* commit 'f72db3f2f3a8c83a4f5dede8fa03434b2bf676c6':
  avconv_vdpau: use the hwcontext device creation API

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
 2016-06-26 15:29:39 +02:00
Clément Bœsch
c01f1157ac Merge commit '0f40c9098498ad90dbbd2380eb4269015e84bde4' 
* commit '0f40c9098498ad90dbbd2380eb4269015e84bde4':
  Drop pointless assert.h #includes

Merged-by: Clément Bœsch <clement@stupeflix.com>
 2016-06-21 15:26:20 +02:00
Michael Niedermayer
ba687ae0bd ffmpeg_vdpau: Free ctx on error path 
Fixes CID1355118

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2016-03-03 16:41:11 +01:00
Michael Niedermayer
1492507208 ffmpeg_vdpau: Remove unused variable 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2016-02-28 23:16:33 +01:00
Derek Buitenhuis
6b706ce85f Merge commit 'bd49be885e9ad6bae599c54473ba2fa2957eb140' 
* commit 'bd49be885e9ad6bae599c54473ba2fa2957eb140':
  avconv_vdpau: use the hwcontext API to simplify code

Tested-by: wm4
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2016-02-17 16:47:05 +00:00
Philip Langdale
d3eb317b86 ffmpeg_vdpau: Ignore decoder's max supported level 
The h264 decoder reports 4.1 as its maximum level, but it will decode
5.1 4K video just fine. In practice, the published level limits in
vdpau do not communicate anything that's actually useful.
 2015-08-16 15:02:33 -07:00
Michael Niedermayer
a6ab9ed50d Merge commit '1f9237f2ac46dfbed1bfa1f4f0f1314c2a1d62ec' 
* commit '1f9237f2ac46dfbed1bfa1f4f0f1314c2a1d62ec':
  avconv_vdpau: allocate video surface of VDPAU-specified size

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-12-27 13:26:38 +01:00
Michael Niedermayer
4d8356b678 Merge commit '8de1d67967a9f9e22c66cb0c1e518ae4f30d07dd' 
* commit '8de1d67967a9f9e22c66cb0c1e518ae4f30d07dd':
  avconv_vdpau: update to new VDPAU interface

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-10-06 16:31:51 +02:00
Michael Niedermayer
403133ab5e ffmpeg: add vdpau_old to allow continued testing of the older (but not oldest) API 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-10-06 16:09:02 +02:00
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