From: Michael Niedermayer Date: Sun, 1 Apr 2007 16:13:24 +0000 (+0000) Subject: make AVCodec.init() optional X-Git-Tag: v0.5~9456 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=6e546aaa248e4ff0b173d61c5c4c40ef63b0535f;p=platform%2Fupstream%2Flibav.git make AVCodec.init() optional Originally committed as revision 8589 to svn://svn.ffmpeg.org/ffmpeg/trunk --- diff --git a/libavcodec/utils.c b/libavcodec/utils.c index 619613f..4539cb9 100644 --- a/libavcodec/utils.c +++ b/libavcodec/utils.c @@ -829,12 +829,14 @@ int avcodec_open(AVCodecContext *avctx, AVCodec *codec) avctx->codec = codec; avctx->codec_id = codec->id; avctx->frame_number = 0; + if(avctx->codec->init){ ret = avctx->codec->init(avctx); if (ret < 0) { av_freep(&avctx->priv_data); avctx->codec= NULL; goto end; } + } ret=0; end: entangled_thread_counter--;