diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-01-12 13:42:42 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-01-12 13:42:42 +0100 |
| commit | dae382b5b28df492e4bfbac35ac6b0cddc994337 (patch) | |
| tree | cfc66c3ea9c7a03b53b9e2683fb4f33898e48c28 /libavutil/pixfmt.h | |
| parent | 15daa8f9ddaf678b924ebe997f7b62381c0e2e0a (diff) | |
| parent | f89466ad6fd69ea570790e9227e612a751703a37 (diff) | |
| download | ffmpeg-streaming-dae382b5b28df492e4bfbac35ac6b0cddc994337.zip ffmpeg-streaming-dae382b5b28df492e4bfbac35ac6b0cddc994337.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
Add version bump and APIchanges entry for Add AV_PIX_FMT_VDPAU.
pixfmt: add picture format for VDPAU
Conflicts:
doc/APIchanges
libavutil/pixfmt.h
libavutil/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavutil/pixfmt.h')
| -rw-r--r-- | libavutil/pixfmt.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libavutil/pixfmt.h b/libavutil/pixfmt.h index 457d9a8..1c00ac4 100644 --- a/libavutil/pixfmt.h +++ b/libavutil/pixfmt.h @@ -200,6 +200,8 @@ enum AVPixelFormat { AV_PIX_FMT_YUVA444P16BE, ///< planar YUV 4:4:4 64bpp, (1 Cr & Cb sample per 1x1 Y & A samples, big-endian) AV_PIX_FMT_YUVA444P16LE, ///< planar YUV 4:4:4 64bpp, (1 Cr & Cb sample per 1x1 Y & A samples, little-endian) + AV_PIX_FMT_VDPAU, ///< HW acceleration through VDPAU, Picture.data[3] contains a VdpVideoSurface + #ifndef AV_PIX_FMT_ABI_GIT_MASTER AV_PIX_FMT_RGBA64BE=0x123, ///< packed RGBA 16:16:16:16, 64bpp, 16R, 16G, 16B, 16A, the 2-byte value for each R/G/B/A component is stored as big-endian AV_PIX_FMT_RGBA64LE, ///< packed RGBA 16:16:16:16, 64bpp, 16R, 16G, 16B, 16A, the 2-byte value for each R/G/B/A component is stored as little-endian @@ -229,7 +231,6 @@ enum AVPixelFormat { AV_PIX_FMT_GBRP12LE, ///< planar GBR 4:4:4 36bpp, little-endian AV_PIX_FMT_GBRP14BE, ///< planar GBR 4:4:4 42bpp, big-endian AV_PIX_FMT_GBRP14LE, ///< planar GBR 4:4:4 42bpp, little-endian - AV_PIX_FMT_NB, ///< number of pixel formats, DO NOT USE THIS if you want to link with shared libav* because the number of formats might differ between versions #if FF_API_PIX_FMT |
