Skip to content

F
ffmpeg.wasm-core
Commit b5c85991 authored by Michael Niedermayer's avatar Michael Niedermayer
Browse files
Options

fix segfault with BLUR8.AVI 

Originally committed as revision 5104 to svn://svn.ffmpeg.org/ffmpeg/trunk
parent 50326295
Show whitespace changes
Inline Side-by-side
Showing with 4 additions and 3 deletions
libavcodec/utils.c
View file @ b5c85991
...@@ -844,9 +844,6 @@ int avcodec_open(AVCodecContext *avctx, AVCodec *codec) ...@@ -844,9 +844,6 @@ int avcodec_open(AVCodecContext *avctx, AVCodec *codec)
if(avctx->codec) if(avctx->codec)
goto end; goto end;
avctx->codec = codec;
avctx->codec_id = codec->id;
avctx->frame_number = 0;
if (codec->priv_data_size > 0) { if (codec->priv_data_size > 0) {
avctx->priv_data = av_mallocz(codec->priv_data_size); avctx->priv_data = av_mallocz(codec->priv_data_size);
if (!avctx->priv_data) if (!avctx->priv_data)
...@@ -865,9 +862,13 @@ int avcodec_open(AVCodecContext *avctx, AVCodec *codec) ...@@ -865,9 +862,13 @@ int avcodec_open(AVCodecContext *avctx, AVCodec *codec)
goto end; goto end;
} }
avctx->codec = codec;
avctx->codec_id = codec->id;
avctx->frame_number = 0;
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;
goto end; goto end;
} }
ret=0; ret=0;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment