diff options
| author | Ken Hughes <khughes@pacific.edu> | 2006-03-31 01:51:59 +0400 |
|---|---|---|
| committer | Ken Hughes <khughes@pacific.edu> | 2006-03-31 01:51:59 +0400 |
| commit | e677cec5188035a65433338b1910b0436b59abde (patch) | |
| tree | 55328b914217365bcd2f619e64f6a1272ba7496c /source/blender/imbuf/intern/util.c | |
| parent | d61be50bee5a889b4ebe4e5bac0b57453806273b (diff) | |
Bugfix: isffmpeg() could access a pointer array using an index of -1,
causing a segfault.
Diffstat (limited to 'source/blender/imbuf/intern/util.c')
| -rw-r--r-- | source/blender/imbuf/intern/util.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/source/blender/imbuf/intern/util.c b/source/blender/imbuf/intern/util.c index d741665f6ea..38a9a2d7b50 100644 --- a/source/blender/imbuf/intern/util.c +++ b/source/blender/imbuf/intern/util.c @@ -266,14 +266,10 @@ static int isffmpeg (char *filename) { break; } - pCodecCtx = get_codec_from_stream(pFormatCtx->streams[videoStream]); - - if(videoStream==-1) { - avcodec_close(pCodecCtx); - av_close_input_file(pFormatCtx); + if(videoStream==-1) return 0; - } + pCodecCtx = get_codec_from_stream(pFormatCtx->streams[videoStream]); /* Find the decoder for the video stream */ pCodec=avcodec_find_decoder(pCodecCtx->codec_id); |