From 6849af7a3b47683e3aac561f8fac3d7186535974 Mon Sep 17 00:00:00 2001 From: Nathan Letwory Date: Fri, 25 May 2007 17:11:24 +0000 Subject: * fix for #6714 - don't handle images with ffmpeg, blender knows itself perfectly fine how to do that. This fix is done as per Qt handling (skip non-Qt files). --- source/blender/imbuf/intern/util.c | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) (limited to 'source/blender/imbuf') diff --git a/source/blender/imbuf/intern/util.c b/source/blender/imbuf/intern/util.c index 38a9a2d7b50..5f8ef796bad 100644 --- a/source/blender/imbuf/intern/util.c +++ b/source/blender/imbuf/intern/util.c @@ -242,6 +242,15 @@ static int isffmpeg (char *filename) { do_init_ffmpeg(); + if( BLI_testextensie(filename, ".swf") || + BLI_testextensie(filename, ".jpg") || + BLI_testextensie(filename, ".png") || + BLI_testextensie(filename, ".tga") || + BLI_testextensie(filename, ".bmp") || + BLI_testextensie(filename, ".exr") || + BLI_testextensie(filename, ".cin") || + BLI_testextensie(filename, ".wav")) return 0; + if(av_open_input_file(&pFormatCtx, filename, NULL, 0, NULL)!=0) { fprintf(stderr, "isffmpeg: av_open_input_file failed\n"); return 0; @@ -266,8 +275,10 @@ static int isffmpeg (char *filename) { break; } - if(videoStream==-1) + if(videoStream==-1) { + av_close_input_file(pFormatCtx); return 0; + } pCodecCtx = get_codec_from_stream(pFormatCtx->streams[videoStream]); -- cgit v1.2.3