diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-10-15 12:30:07 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-10-15 12:30:07 +0200 |
| commit | 51c810e62b63a1451b337b1cba0141b386066668 (patch) | |
| tree | 1b5d4697495201e68400608a0bb9fc1ba738ebb8 /libavcodec/vdpau.h | |
| parent | fd937866f7b7ae3303e8a78b1e9a48d853360d62 (diff) | |
| parent | d565fef1b83b6c5f8afb32229260b79f67c68109 (diff) | |
| download | ffmpeg-51c810e62b63a1451b337b1cba0141b386066668.tar.gz | |
Merge commit 'd565fef1b83b6c5f8afb32229260b79f67c68109'
* commit 'd565fef1b83b6c5f8afb32229260b79f67c68109':
vdpau: add AV_HWACCEL_FLAG_IGNORE_LEVEL to skip the codec level check
Conflicts:
libavcodec/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/vdpau.h')
| -rw-r--r-- | libavcodec/vdpau.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/vdpau.h b/libavcodec/vdpau.h index a8483d77f3..d686ef45da 100644 --- a/libavcodec/vdpau.h +++ b/libavcodec/vdpau.h @@ -162,7 +162,7 @@ void av_vdpau_hwaccel_set_render2(AVVDPAUContext *, AVVDPAU_Render2); * @param avctx decoding context whose get_format() callback is invoked * @param device VDPAU device handle to use for hardware acceleration * @param get_proc_address VDPAU device driver - * @param flags for future use, must be zero + * @param flags zero of more OR'd AV_HWACCEL_FLAG_* flags * * @return 0 on success, an AVERROR code on failure. */ |