diff options
| author | wm4 <nfxjfg@googlemail.com> | 2015-11-06 12:59:16 +0100 |
|---|---|---|
| committer | wm4 <nfxjfg@googlemail.com> | 2015-11-07 19:24:49 +0100 |
| commit | b07cbf6724207ba768ebb2ccdee1b6749fd6ca31 (patch) | |
| tree | 619b785a1ab13994103562b35947bbbabf1587bc /libavcodec/mmaldec.c | |
| parent | 785ac437be6b8e12bf58bc2c53547a891cd7d5f1 (diff) | |
mmaldec: add vc1 decoding support
Diffstat (limited to 'libavcodec/mmaldec.c')
| -rw-r--r-- | libavcodec/mmaldec.c | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/libavcodec/mmaldec.c b/libavcodec/mmaldec.c index 91fb084e10..8d74b3f0b3 100644 --- a/libavcodec/mmaldec.c +++ b/libavcodec/mmaldec.c @@ -355,6 +355,10 @@ static av_cold int ffmmal_init_decoder(AVCodecContext *avctx) format_in->encoding = MMAL_ENCODING_MP2V; av_log(avctx, AV_LOG_DEBUG, "Use MMAL MP2V encoding\n"); break; + case AV_CODEC_ID_VC1: + format_in->encoding = MMAL_ENCODING_WVC1; + av_log(avctx, AV_LOG_DEBUG, "Use MMAL WVC1 encoding\n"); + break; case AV_CODEC_ID_H264: default: format_in->encoding = MMAL_ENCODING_H264; @@ -783,6 +787,13 @@ AVHWAccel ff_mpeg2_mmal_hwaccel = { .pix_fmt = AV_PIX_FMT_MMAL, }; +AVHWAccel ff_vc1_mmal_hwaccel = { + .name = "vc1_mmal", + .type = AVMEDIA_TYPE_VIDEO, + .id = AV_CODEC_ID_VC1, + .pix_fmt = AV_PIX_FMT_MMAL, +}; + static const AVOption options[]={ {"extra_buffers", "extra buffers", offsetof(MMALDecodeContext, extra_buffers), AV_OPT_TYPE_INT, {.i64 = 10}, 0, 256, 0}, {NULL} @@ -817,3 +828,4 @@ static const AVOption options[]={ FFMMAL_DEC(h264, AV_CODEC_ID_H264) FFMMAL_DEC(mpeg2, AV_CODEC_ID_MPEG2VIDEO) +FFMMAL_DEC(vc1, AV_CODEC_ID_VC1) |