diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-11-14 13:00:10 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-11-14 13:00:10 +0100 |
| commit | 5f231d909f158e40d20281b88e7aecc2333057fe (patch) | |
| tree | 4a7a02aad0bc1d864181b156306dfb3c2aed0f32 /libavcodec/vdpau.h | |
| parent | f3458a56c117674bf6003b59250c79a13308c05f (diff) | |
| parent | ca22d1dea2842fca0422dd1d2bd09e7eb2c8f118 (diff) | |
| download | ffmpeg-5f231d909f158e40d20281b88e7aecc2333057fe.tar.gz | |
Merge commit 'ca22d1dea2842fca0422dd1d2bd09e7eb2c8f118'
* commit 'ca22d1dea2842fca0422dd1d2bd09e7eb2c8f118':
vdpau: add a convenience function for getting a decoder profile.
Conflicts:
doc/APIchanges
libavcodec/vdpau.c
libavcodec/vdpau.h
libavcodec/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/vdpau.h')
| -rw-r--r-- | libavcodec/vdpau.h | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/libavcodec/vdpau.h b/libavcodec/vdpau.h index 97889aeea0..b84bdeaeba 100644 --- a/libavcodec/vdpau.h +++ b/libavcodec/vdpau.h @@ -53,6 +53,8 @@ #include <vdpau/vdpau_x11.h> #include "libavutil/avconfig.h" #include "libavutil/attributes.h" + +#include "avcodec.h" #include "version.h" #if FF_API_BUFS_VDPAU @@ -143,6 +145,19 @@ AVVDPAUContext *av_alloc_vdpaucontext(void); AVVDPAU_Render2 av_vdpau_hwaccel_get_render2(const AVVDPAUContext *); void av_vdpau_hwaccel_set_render2(AVVDPAUContext *, AVVDPAU_Render2); +/** + * Get a decoder profile that should be used for initializing a VDPAU decoder. + * Should be called from the AVCodecContext.get_format() callback. + * + * @param avctx the codec context being used for decoding the stream + * @param profile a pointer into which the result will be written on success. + * The contents of profile are undefined if this function returns + * an error. + * + * @return 0 on success (non-negative), a negative AVERROR on failure. + */ +int av_vdpau_get_profile(AVCodecContext *avctx, VdpDecoderProfile *profile); + #if FF_API_CAP_VDPAU /** @brief The videoSurface is used for rendering. */ #define FF_VDPAU_STATE_USED_FOR_RENDER 1 |