diff options
Diffstat (limited to 'libavcodec/mmaldec.c')
| -rw-r--r-- | libavcodec/mmaldec.c | 19 |
1 files changed, 15 insertions, 4 deletions
diff --git a/libavcodec/mmaldec.c b/libavcodec/mmaldec.c index 193df7e07d..099a8c58e0 100644 --- a/libavcodec/mmaldec.c +++ b/libavcodec/mmaldec.c @@ -2,20 +2,20 @@ * MMAL Video Decoder * Copyright (c) 2015 Rodger Combs * - * This file is part of Libav. + * This file is part of FFmpeg. * - * Libav is free software; you can redistribute it and/or + * FFmpeg is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either * version 2.1 of the License, or (at your option) any later version. * - * Libav is distributed in the hope that it will be useful, + * FFmpeg is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with Libav; if not, write to the Free Software + * License along with FFmpeg; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ @@ -360,6 +360,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; @@ -795,6 +798,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, @@ -837,4 +847,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) |