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/avcodec.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/avcodec.h')
| -rw-r--r-- | libavcodec/avcodec.h | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index f9ab7c2da9..27d6e55d61 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -3229,7 +3229,8 @@ int av_codec_get_max_lowres(const AVCodec *codec); struct MpegEncContext; /** - * AVHWAccel. + * @defgroup lavc_hwaccel AVHWAccel + * @{ */ typedef struct AVHWAccel { /** @@ -3366,6 +3367,17 @@ typedef struct AVHWAccel { } AVHWAccel; /** + * Hardware acceleration should be used for decoding even if the codec level + * used is unknown or higher than the maximum supported level reported by the + * hardware driver. + */ +#define AV_HWACCEL_FLAG_IGNORE_LEVEL (1 << 0) + +/** + * @} + */ + +/** * @defgroup lavc_picture AVPicture * * Functions for working with AVPicture |