RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

libopenh264dec: Simplify the init thanks to FF_CODEC_CAP_INIT_CLEANUP being set 

Signed-off-by: Martin Storsjö <martin@martin.st>
This commit is contained in:
Martin Storsjö 2016-07-14 22:20:25 +03:00
parent d0b1e6049b
commit 36b380dcd5
1 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
libavcodec/libopenh264dec.c
View File

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