projects
/
platform
/
upstream
/
libav.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
fa1ab87
)
make AVCodec.init() optional
author
Michael Niedermayer
<michaelni@gmx.at>
Sun, 1 Apr 2007 16:13:24 +0000
(16:13 +0000)
committer
Michael Niedermayer
<michaelni@gmx.at>
Sun, 1 Apr 2007 16:13:24 +0000
(16:13 +0000)
Originally committed as revision 8589 to svn://svn.ffmpeg.org/ffmpeg/trunk
libavcodec/utils.c
patch
|
blob
|
history
diff --git
a/libavcodec/utils.c
b/libavcodec/utils.c
index 619613f2d2b7ae5334baea68b28d61c3341123dc..4539cb945e454aa405a462833f7db7fb01607498 100644
(file)
--- 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--;