Skip to content

F
ffmpeg.wasm-core
Commit 7f116973 authored by wm4's avatar wm4
Browse files
Options

mmaldec: do not mutate user's AVCodecContext extradata field

parent 750f72d7
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 5 deletions
libavcodec/mmaldec.c
View file @ 7f116973
...@@ -361,10 +361,8 @@ static av_cold int ffmmal_init_decoder(AVCodecContext *avctx) ...@@ -361,10 +361,8 @@ static av_cold int ffmmal_init_decoder(AVCodecContext *avctx)
ret = AVERROR(ENOSYS); ret = AVERROR(ENOSYS);
goto fail; goto fail;
} }
av_bitstream_filter_filter(ctx->bsfc, avctx, NULL, &dummy_p, &dummy_int, NULL, 0, 0); av_bitstream_filter_filter(ctx->bsfc, avctx, "private_spspps_buf", &dummy_p, &dummy_int, NULL, 0, 0);
} } else if (avctx->extradata_size) {
if (avctx->extradata_size) {
if ((status = mmal_format_extradata_alloc(format_in, avctx->extradata_size))) if ((status = mmal_format_extradata_alloc(format_in, avctx->extradata_size)))
goto fail; goto fail;
format_in->extradata_size = avctx->extradata_size; format_in->extradata_size = avctx->extradata_size;
...@@ -453,7 +451,7 @@ static int ffmmal_add_packet(AVCodecContext *avctx, AVPacket *avpkt) ...@@ -453,7 +451,7 @@ static int ffmmal_add_packet(AVCodecContext *avctx, AVPacket *avpkt)
if (ctx->bsfc) { if (ctx->bsfc) {
uint8_t *tmp_data; uint8_t *tmp_data;
int tmp_size; int tmp_size;
if ((ret = av_bitstream_filter_filter(ctx->bsfc, avctx, NULL, if ((ret = av_bitstream_filter_filter(ctx->bsfc, avctx, "private_spspps_buf",
&tmp_data, &tmp_size, &tmp_data, &tmp_size,
avpkt->data, avpkt->size, avpkt->data, avpkt->size,
avpkt->flags & AV_PKT_FLAG_KEY)) < 0) avpkt->flags & AV_PKT_FLAG_KEY)) < 0)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment