Revision: 17043
          
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=17043
Author:   schlaile
Date:     2008-10-12 14:00:26 +0200 (Sun, 12 Oct 2008)

Log Message:
-----------
== Sequencer ==

This fixes (works around):
[#13598] LOAD / SAVE: Segfault after attempting to load surround encoded file

Modified Paths:
--------------
    trunk/blender/source/blender/src/hddaudio.c

Modified: trunk/blender/source/blender/src/hddaudio.c
===================================================================
--- trunk/blender/source/blender/src/hddaudio.c 2008-10-12 11:38:28 UTC (rev 
17042)
+++ trunk/blender/source/blender/src/hddaudio.c 2008-10-12 12:00:26 UTC (rev 
17043)
@@ -150,6 +150,15 @@
                return 0;
        }
 
+       if (pCodecCtx->channels > 2) {
+               fprintf(stderr, "Sorry, audio file has too many channels."
+                       " Will fix in future, but resampler doesn't support "
+                       "this.\n");
+               avcodec_close(pCodecCtx);
+               av_close_input_file(pFormatCtx);
+               return 0;
+       }
+
        rval = (struct hdaudio *)MEM_mallocN(sizeof(struct hdaudio), 
                                             "hdaudio struct");
 


_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs

Reply via email to