diff options
| author | wm4 <nfxjfg@googlemail.com> | 2015-03-27 23:04:08 +0100 |
|---|---|---|
| committer | Anton Khirnov <anton@khirnov.net> | 2015-03-29 09:55:20 +0200 |
| commit | c48456166e95648719a8be8f8613f9dee98205c1 (patch) | |
| tree | 7ebe903f27b29ce28e9e871dd0e68393addc1ccc /libavutil | |
| parent | 72b7441a10f578a1d0be7083d8f5adf6a01921c2 (diff) | |
| download | ffmpeg-c48456166e95648719a8be8f8613f9dee98205c1.tar.gz | |
lavc: add MMAL hardware decoder wrapper
Based on a patch by Rodger Combs.
Signed-off-by: Anton Khirnov <anton@khirnov.net>
Diffstat (limited to 'libavutil')
| -rw-r--r-- | libavutil/pixdesc.c | 4 | ||||
| -rw-r--r-- | libavutil/pixfmt.h | 5 | ||||
| -rw-r--r-- | libavutil/version.h | 4 |
3 files changed, 11 insertions, 2 deletions
diff --git a/libavutil/pixdesc.c b/libavutil/pixdesc.c index f99137032d..ea432f9079 100644 --- a/libavutil/pixdesc.c +++ b/libavutil/pixdesc.c @@ -1567,6 +1567,10 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { .name = "qsv", .flags = AV_PIX_FMT_FLAG_HWACCEL, }, + [AV_PIX_FMT_MMAL] = { + .name = "mmal", + .flags = AV_PIX_FMT_FLAG_HWACCEL, + }, }; static const char *color_range_names[AVCOL_RANGE_NB] = { diff --git a/libavutil/pixfmt.h b/libavutil/pixfmt.h index d1bf36769d..e21100f1f7 100644 --- a/libavutil/pixfmt.h +++ b/libavutil/pixfmt.h @@ -214,6 +214,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, 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 diff --git a/libavutil/version.h b/libavutil/version.h index c1a302966e..b94db74d2c 100644 --- a/libavutil/version.h +++ b/libavutil/version.h @@ -54,8 +54,8 @@ */ #define LIBAVUTIL_VERSION_MAJOR 54 -#define LIBAVUTIL_VERSION_MINOR 9 -#define LIBAVUTIL_VERSION_MICRO 1 +#define LIBAVUTIL_VERSION_MINOR 10 +#define LIBAVUTIL_VERSION_MICRO 0 #define LIBAVUTIL_VERSION_INT AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \ LIBAVUTIL_VERSION_MINOR, \ |