virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-11-06 08:29:25 +02:00
Code Issues Releases Activity

Merge commit '35177ba77ff60a8b8839783f57e44bcc4214507a'

Browse Source 
* commit '35177ba77ff60a8b8839783f57e44bcc4214507a':
  avconv: add support for DXVA2 decoding

Conflicts:
	Makefile
	configure

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer
2014-04-29 01:06:58 +02:00
parent 9c6eef6f5f 35177ba77f
commit c6eee3120a
7 changed files with 637 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ffmpeg.h
View File

@@ -60,6 +60,7 @@ enum HWAccelID {
HWACCEL_NONE = 0,
HWACCEL_AUTO,
HWACCEL_VDPAU,
HWACCEL_DXVA2,
};
typedef struct HWAccel {
@@ -512,5 +513,6 @@ FilterGraph *init_simple_filtergraph(InputStream *ist, OutputStream *ost);
int ffmpeg_parse_options(int argc, char **argv);
int vdpau_init(AVCodecContext *s);
int dxva2_init(AVCodecContext *s);
#endif /* FFMPEG_H */