diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2015-03-29 11:32:24 +0200 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2015-03-29 11:32:24 +0200 |
commit | 268ff17cb785c3ae94be0aca31ed8709e149b487 (patch) | |
tree | 0d8f9f3b52d0430765ef2bfe389cbea1149b4ca8 /libavutil/pixfmt.h | |
parent | cf16b459a873b990efc10d93e9912ab01b8a0fba (diff) | |
parent | c48456166e95648719a8be8f8613f9dee98205c1 (diff) |
Merge commit 'c48456166e95648719a8be8f8613f9dee98205c1'
* commit 'c48456166e95648719a8be8f8613f9dee98205c1':
lavc: add MMAL hardware decoder wrapper
Conflicts:
Changelog
configure
doc/APIchanges
libavcodec/Makefile
libavcodec/allcodecs.c
libavcodec/version.h
libavutil/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavutil/pixfmt.h')
-rw-r--r-- | libavutil/pixfmt.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/libavutil/pixfmt.h b/libavutil/pixfmt.h index 50403d748d..534747b8f5 100644 --- a/libavutil/pixfmt.h +++ b/libavutil/pixfmt.h @@ -252,6 +252,11 @@ enum AVPixelFormat { * mfxFrameSurface1 structure. */ AV_PIX_FMT_QSV, + /** + * HW acceleration though MMAL, data[3] contains a pointer to the + * MMAL_BUFFER_HEADER_T structure. + */ + AV_PIX_FMT_MMAL, #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 |