diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-05-12 00:37:12 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-05-12 00:37:12 +0200 |
| commit | 14aef38a698229f12bbf980b4e45f2ee55edfcfe (patch) | |
| tree | afae850cca16aef5137bd6dd2fb82ab2ae5cff95 /libavutil/pixdesc.c | |
| parent | 2ec4586d77c18eff38c128936a67b7d7a2e7f9a0 (diff) | |
| parent | 66e6c8a7b4e3ac926302529606bd3e323c28b20f (diff) | |
Merge commit '66e6c8a7b4e3ac926302529606bd3e323c28b20f'
* commit '66e6c8a7b4e3ac926302529606bd3e323c28b20f':
lavu: Add a pixel format for new VDA hwaccel
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 | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/libavutil/pixdesc.c b/libavutil/pixdesc.c index 6b1b05f3fa..f00907dc24 100644 --- a/libavutil/pixdesc.c +++ b/libavutil/pixdesc.c @@ -1874,6 +1874,10 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { }, .flags = AV_PIX_FMT_FLAG_PLANAR | AV_PIX_FMT_FLAG_BE, }, + [AV_PIX_FMT_VDA] = { + .name = "vda", + .flags = AV_PIX_FMT_FLAG_HWACCEL, + }, }; FF_DISABLE_DEPRECATION_WARNINGS |