diff options
| author | Nathan Letwory <nathan@letworyinteractive.com> | 2007-05-25 21:11:24 +0400 |
|---|---|---|
| committer | Nathan Letwory <nathan@letworyinteractive.com> | 2007-05-25 21:11:24 +0400 |
| commit | 6849af7a3b47683e3aac561f8fac3d7186535974 (patch) | |
| tree | e5a49e5458ecf0afca7797cced403d6ad5c7fe3f /source/blender/imbuf | |
| parent | f231bd0d5715ac67767f96f3a8d20ebf618f7b03 (diff) | |
* 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).
Diffstat (limited to 'source/blender/imbuf')
| -rw-r--r-- | source/blender/imbuf/intern/util.c | 13 |
1 files changed, 12 insertions, 1 deletions
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]); |