Commit 36b380dc authored by Martin Storsjö's avatar Martin Storsjö

libopenh264dec: Simplify the init thanks to FF_CODEC_CAP_INIT_CLEANUP being set

Signed-off-by: 's avatarMartin Storsjö <martin@martin.st>
parent d0b1e604
......@@ -72,15 +72,12 @@ static av_cold int svc_decode_init(AVCodecContext *avctx)
return err;
s->packet_fifo = av_fifo_alloc(sizeof(AVPacket));
if (!s->packet_fifo) {
err = AVERROR(ENOMEM);
goto fail;
}
if (!s->packet_fifo)
return AVERROR(ENOMEM);
if (WelsCreateDecoder(&s->decoder)) {
av_log(avctx, AV_LOG_ERROR, "Unable to create decoder\n");
err = AVERROR_UNKNOWN;
goto fail;
return AVERROR_UNKNOWN;
}
// Pass all libopenh264 messages to our callback, to allow ourselves to filter them.
......@@ -98,14 +95,12 @@ static av_cold int svc_decode_init(AVCodecContext *avctx)
if ((*s->decoder)->Initialize(s->decoder, &param) != cmResultSuccess) {
av_log(avctx, AV_LOG_ERROR, "Initialize failed\n");
err = AVERROR_UNKNOWN;
goto fail;
return AVERROR_UNKNOWN;
}
avctx->pix_fmt = AV_PIX_FMT_YUV420P;
fail:
return err;
return 0;
}
static int init_bsf(AVCodecContext *avctx)
......
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