if (avctx->extradata_size && !s->parsed_extradata) {
s->parsed_extradata = 1;
- ret = ff_cbs_read(s->cbc, td, avctx->extradata, avctx->extradata_size);
+ ret = ff_cbs_read_extradata_from_codec(s->cbc, td, avctx);
if (ret < 0) {
av_log(avctx, AV_LOG_WARNING, "Failed to parse extradata.\n");
}
avctx->color_trc = (enum AVColorTransferCharacteristic) color->transfer_characteristics;
avctx->color_range = color->color_range ? AVCOL_RANGE_JPEG : AVCOL_RANGE_MPEG;
- if (ctx->width != avctx->width || ctx->height != avctx->height) {
- ret = ff_set_dimensions(avctx, ctx->width, ctx->height);
- if (ret < 0)
- goto end;
- }
-
if (avctx->framerate.num)
avctx->time_base = av_inv_q(av_mul_q(avctx->framerate, (AVRational){avctx->ticks_per_frame, 1}));
if (ret < 0)
return ret;
- s->cbc->decompose_unit_types = (CodedBitstreamUnitType *)decompose_unit_types;
+ s->cbc->decompose_unit_types = decompose_unit_types;
s->cbc->nb_decompose_unit_types = FF_ARRAY_ELEMS(decompose_unit_types);
return 0;