summaryrefslogtreecommitdiff
path: root/libavcodec/mmaldec.c
diff options
context:
space:
mode:
authorHendrik Leppkes <h.leppkes@gmail.com>2015-09-26 11:07:44 +0200
committerHendrik Leppkes <h.leppkes@gmail.com>2015-09-26 11:07:44 +0200
commitf3310df8538d201e8623ffbcf7f4fee0bec94f83 (patch)
tree9c2b0c0b1f21965909288e68011499bed9ffee0d /libavcodec/mmaldec.c
parentc5a312dd6afb9aded1f8f763be71ef70d69c7e17 (diff)
parent49623f531972be5dc2dd8c1b4b8748cad7c424ff (diff)
Merge commit '49623f531972be5dc2dd8c1b4b8748cad7c424ff'
* commit '49623f531972be5dc2dd8c1b4b8748cad7c424ff': mmal: Remove setting extradata on input format Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
Diffstat (limited to 'libavcodec/mmaldec.c')
-rw-r--r--libavcodec/mmaldec.c7
1 files changed, 0 insertions, 7 deletions
diff --git a/libavcodec/mmaldec.c b/libavcodec/mmaldec.c
index 1253ca6023..43edb7fd24 100644
--- a/libavcodec/mmaldec.c
+++ b/libavcodec/mmaldec.c
@@ -352,13 +352,6 @@ static av_cold int ffmmal_init_decoder(AVCodecContext *avctx)
format_in->es->video.par.den = avctx->sample_aspect_ratio.den;
format_in->flags = MMAL_ES_FORMAT_FLAG_FRAMED;
- if (avctx->extradata_size) {
- if ((status = mmal_format_extradata_alloc(format_in, avctx->extradata_size)))
- goto fail;
- format_in->extradata_size = avctx->extradata_size;
- memcpy(format_in->extradata, avctx->extradata, format_in->extradata_size);
- }
-
if ((status = mmal_port_format_commit(decoder->input[0])))
goto fail;