mirror of https://git.ffmpeg.org/ffmpeg.git
Merge commit '49623f531972be5dc2dd8c1b4b8748cad7c424ff'
* commit '49623f531972be5dc2dd8c1b4b8748cad7c424ff': mmal: Remove setting extradata on input format Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
This commit is contained in:
commit
f3310df853
|
@ -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->es->video.par.den = avctx->sample_aspect_ratio.den;
|
||||||
format_in->flags = MMAL_ES_FORMAT_FLAG_FRAMED;
|
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])))
|
if ((status = mmal_port_format_commit(decoder->input[0])))
|
||||||
goto fail;
|
goto fail;
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue