make AVCodec.init() optional
Originally committed as revision 8589 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
parent
fa1ab87200
commit
6e546aaa24
1 changed files with 2 additions and 0 deletions
|
|
@ -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--;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue