diff options
| author | Peter Schlaile <peter@schlaile.de> | 2009-06-21 16:02:40 +0400 |
|---|---|---|
| committer | Peter Schlaile <peter@schlaile.de> | 2009-06-21 16:02:40 +0400 |
| commit | 4dec9f3cb620098aba742c43b69031eb6b3f4591 (patch) | |
| tree | 573f043bc596868587019114427f263cffa4ff03 | |
| parent | bc77cc3a818364b1af84203ebef8381f55aef6d4 (diff) | |
== Sequencer ==
Very, very last minute patch for Blender on Windows systems:
move blender's internal AVI reader the last try in the list of
codecs, when opening movie files.
Otherwise, it will fail on Movie Maker captured DV-AVI files.
(isavi() seems to mistreat these files as RAW/MJPEG AVI and fails
later on IMB_anim_absolute() )
| -rw-r--r-- | source/blender/imbuf/intern/util.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/source/blender/imbuf/intern/util.c b/source/blender/imbuf/intern/util.c index ffd5d3431af..26434583118 100644 --- a/source/blender/imbuf/intern/util.c +++ b/source/blender/imbuf/intern/util.c @@ -401,8 +401,6 @@ int imb_get_anim_type(char * name) { if (ib_stat(name,&st) == -1) return(0); if (((st.st_mode) & S_IFMT) != S_IFREG) return(0); - if (isavi(name)) return (ANIM_AVI); - if (ismovie(name)) return (ANIM_MOVIE); # ifdef WITH_QUICKTIME if (isqtime(name)) return (ANIM_QTIME); @@ -410,6 +408,7 @@ int imb_get_anim_type(char * name) { # ifdef WITH_FFMPEG if (isffmpeg(name)) return (ANIM_FFMPEG); # endif + if (isavi(name)) return (ANIM_AVI); #endif #ifdef WITH_REDCODE if (isredcode(name)) return (ANIM_REDCODE); |