make AVCodec.init() optional
Originally committed as revision 8589 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
@@ -829,12 +829,14 @@ int avcodec_open(AVCodecContext *avctx, AVCodec *codec)
|
|||||||
avctx->codec = codec;
|
avctx->codec = codec;
|
||||||
avctx->codec_id = codec->id;
|
avctx->codec_id = codec->id;
|
||||||
avctx->frame_number = 0;
|
avctx->frame_number = 0;
|
||||||
|
if(avctx->codec->init){
|
||||||
ret = avctx->codec->init(avctx);
|
ret = avctx->codec->init(avctx);
|
||||||
if (ret < 0) {
|
if (ret < 0) {
|
||||||
av_freep(&avctx->priv_data);
|
av_freep(&avctx->priv_data);
|
||||||
avctx->codec= NULL;
|
avctx->codec= NULL;
|
||||||
goto end;
|
goto end;
|
||||||
}
|
}
|
||||||
|
}
|
||||||
ret=0;
|
ret=0;
|
||||||
end:
|
end:
|
||||||
entangled_thread_counter--;
|
entangled_thread_counter--;
|
||||||
|
Reference in New Issue
Block a user