diff options
| author | Joerg Mueller <nexyon@gmail.com> | 2011-04-18 18:24:36 +0400 |
|---|---|---|
| committer | Joerg Mueller <nexyon@gmail.com> | 2011-04-18 18:24:36 +0400 |
| commit | 5f08bfd46c31bb67780ee4081428be0d22f703ae (patch) | |
| tree | e5097149e2e860a761292391184dd6946c3b979e /source | |
| parent | 54f31672701fae259dc28477e6b5ae323641c395 (diff) | |
Fix for [#26990] Loading file w packed audio crashes
FFMPEG was reallocating buffers it didn't own and wasn't allowed to. This workaround should work now flawlessly.
Also fixing a bug regarding unpacking sounds, the UI stated unpacking to //audio/filename while it was unpacking to //sounds/filename
Diffstat (limited to 'source')
| -rw-r--r-- | source/blender/editors/sound/sound_ops.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/editors/sound/sound_ops.c b/source/blender/editors/sound/sound_ops.c index a07f4ff0f5f..74dbb8f6d12 100644 --- a/source/blender/editors/sound/sound_ops.c +++ b/source/blender/editors/sound/sound_ops.c @@ -254,7 +254,7 @@ static int sound_unpack_invoke(bContext *C, wmOperator *op, wmEvent *UNUSED(even if(G.fileflags & G_AUTOPACK) BKE_report(op->reports, RPT_WARNING, "AutoPack is enabled, so image will be packed again on file save."); - unpack_menu(C, "SOUND_OT_unpack", sound->id.name+2, sound->name, "audio", sound->packedfile); + unpack_menu(C, "SOUND_OT_unpack", sound->id.name+2, sound->name, "sounds", sound->packedfile); return OPERATOR_FINISHED; } |