diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2013-01-12 16:42:42 +0400 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2013-01-12 16:42:42 +0400 |
commit | dae382b5b28df492e4bfbac35ac6b0cddc994337 (patch) | |
tree | cfc66c3ea9c7a03b53b9e2683fb4f33898e48c28 /libavutil/pixdesc.c | |
parent | 15daa8f9ddaf678b924ebe997f7b62381c0e2e0a (diff) | |
parent | f89466ad6fd69ea570790e9227e612a751703a37 (diff) |
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/pixdesc.c')
-rw-r--r-- | libavutil/pixdesc.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/libavutil/pixdesc.c b/libavutil/pixdesc.c index f9be147ad9..1016dbaecb 100644 --- a/libavutil/pixdesc.c +++ b/libavutil/pixdesc.c @@ -1654,6 +1654,12 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { }, .flags = PIX_FMT_BE | PIX_FMT_PLANAR | PIX_FMT_RGB, }, + [AV_PIX_FMT_VDPAU] = { + .name = "vdpau", + .log2_chroma_w = 1, + .log2_chroma_h = 1, + .flags = PIX_FMT_HWACCEL, + }, }; static enum AVPixelFormat get_pix_fmt_internal(const char *name) |