diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-11-23 14:43:08 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-11-23 14:46:48 +0100 |
| commit | 3e641b4842b8b5f6592991479d19f1a7ce846308 (patch) | |
| tree | 25bee33d11ceddf0ee1758dd8cf5763764d5fc80 /ffmpeg_opt.c | |
| parent | 62e10c375968d9cbbe2a0bc321e00eef52d32917 (diff) | |
| parent | 7671dd7cd7d51bbd637cc46d8f104a141bc355ea (diff) | |
| download | ffmpeg-3e641b4842b8b5f6592991479d19f1a7ce846308.tar.gz | |
Merge commit '7671dd7cd7d51bbd637cc46d8f104a141bc355ea'
* commit '7671dd7cd7d51bbd637cc46d8f104a141bc355ea':
avconv: add support for VDPAU decoding
Conflicts:
Changelog
Makefile
configure
ffmpeg.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'ffmpeg_opt.c')
| -rw-r--r-- | ffmpeg_opt.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/ffmpeg_opt.c b/ffmpeg_opt.c index 8e01c685d1..dc70c8b6a5 100644 --- a/ffmpeg_opt.c +++ b/ffmpeg_opt.c @@ -64,6 +64,9 @@ } const HWAccel hwaccels[] = { +#if HAVE_VDPAU_X11 + { "vdpau", vdpau_init, HWACCEL_VDPAU, AV_PIX_FMT_VDPAU }, +#endif { 0 }, }; |