diff options
| author | wm4 <nfxjfg@googlemail.com> | 2016-01-28 17:24:40 +0100 |
|---|---|---|
| committer | wm4 <nfxjfg@googlemail.com> | 2016-01-28 17:24:40 +0100 |
| commit | 7b1b53f3a4569343dee1f0e2493b7cf3aa45731a (patch) | |
| tree | 82f3aa8b96bb44e11f7e3690574aabd9ea7b0a54 /libavcodec/mmaldec.c | |
| parent | d27a12cb0982921e503e68692bb99b6dfe1a6144 (diff) | |
mmaldec: support MPEG-4
I guess this means part 2 in both cases. Not sure which profiles exactly
are actually supported properly.
Diffstat (limited to 'libavcodec/mmaldec.c')
| -rw-r--r-- | libavcodec/mmaldec.c | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/libavcodec/mmaldec.c b/libavcodec/mmaldec.c index 16e98ad161..ed633948b4 100644 --- a/libavcodec/mmaldec.c +++ b/libavcodec/mmaldec.c @@ -358,6 +358,9 @@ static av_cold int ffmmal_init_decoder(AVCodecContext *avctx) case AV_CODEC_ID_MPEG2VIDEO: format_in->encoding = MMAL_ENCODING_MP2V; break; + case AV_CODEC_ID_MPEG4: + format_in->encoding = MMAL_ENCODING_MP4V; + break; case AV_CODEC_ID_VC1: format_in->encoding = MMAL_ENCODING_WVC1; break; @@ -793,6 +796,13 @@ AVHWAccel ff_mpeg2_mmal_hwaccel = { .pix_fmt = AV_PIX_FMT_MMAL, }; +AVHWAccel ff_mpeg4_mmal_hwaccel = { + .name = "mpeg4_mmal", + .type = AVMEDIA_TYPE_VIDEO, + .id = AV_CODEC_ID_MPEG4, + .pix_fmt = AV_PIX_FMT_MMAL, +}; + AVHWAccel ff_vc1_mmal_hwaccel = { .name = "vc1_mmal", .type = AVMEDIA_TYPE_VIDEO, @@ -834,4 +844,5 @@ static const AVOption options[]={ FFMMAL_DEC(h264, AV_CODEC_ID_H264) FFMMAL_DEC(mpeg2, AV_CODEC_ID_MPEG2VIDEO) +FFMMAL_DEC(mpeg4, AV_CODEC_ID_MPEG4) FFMMAL_DEC(vc1, AV_CODEC_ID_VC1) |