Skip to content
Snippets Groups Projects
Commit ecbd1205 authored by Steve Lhomme's avatar Steve Lhomme
Browse files

contrib: lame: fix a crash when compiled for ARM with MSVC

Probably some issues with the FLOAT in the structure.
parent ae0f98f7
No related branches found
No related tags found
No related merge requests found
......@@ -12,6 +12,9 @@ lame: lame-$(LAME_VERSION).tar.gz .sum-lame
$(UNPACK)
$(APPLY) $(SRC)/lame/lame-forceinline.patch
$(APPLY) $(SRC)/lame/sse.patch
ifdef HAVE_VISUALSTUDIO
$(APPLY) $(SRC)/lame/struct-float-copy.patch
endif
# Avoid relying on iconv.m4 from gettext, when reconfiguring.
# This is only used by the frontend which we disable.
cd $(UNPACK_DIR) && sed -i.orig 's/^AM_ICONV/#&/' configure.in
......
--- lame/libmp3lame/quantize.c.msvc 2017-08-15 15:40:45.000000000 +0200
+++ lame/libmp3lame/quantize.c 2019-05-29 07:55:46.658315100 +0200
@@ -1137,7 +1137,7 @@ outer_loop(lame_internal_flags * gfc, gr
/* save data so we can restore this quantization later */
if (better) {
best_part2_3_length = cod_info->part2_3_length;
- best_noise_info = noise_info;
+ memcpy(&best_noise_info, &noise_info, sizeof(best_noise_info));
*cod_info = cod_info_w;
age = 0;
/* save data so we can restore this quantization later */
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment