Book a Demo!
CoCalc Logo Icon
StoreFeaturesDocsShareSupportNewsAboutPoliciesSign UpSign In
godotengine
GitHub Repository: godotengine/godot
 Path: blob/master/thirdparty/minimp3/patches/0002-msvc-warnings.patch
9912 views
1
diff --git a/thirdparty/minimp3/minimp3_ex.h b/thirdparty/minimp3/minimp3_ex.h

2
index 2871705df3..2b207a25a7 100644

3
--- a/thirdparty/minimp3/minimp3_ex.h

4
+++ b/thirdparty/minimp3/minimp3_ex.h

5
@@ -377,7 +377,7 @@ int mp3dec_load_cb(mp3dec_t *dec, mp3dec_io_t *io, uint8_t *buf, size_t buf_size

6
         samples = hdr_frame_samples(hdr)*frame_info.channels;

7
         if (3 != frame_info.layer)

8
             break;

9
-        int ret = mp3dec_check_vbrtag(hdr, frame_size, &frames, &delay, &padding);

10
+        ret = mp3dec_check_vbrtag(hdr, frame_size, &frames, &delay, &padding);

11
         if (ret > 0)

12
         {

13
             padding *= frame_info.channels;

14
@@ -529,7 +529,8 @@ int mp3dec_iterate_buf(const uint8_t *buf, size_t buf_size, MP3D_ITERATE_CB call

15
 

16
         if (callback)

17
         {

18
-            if ((ret = callback(user_data, hdr, frame_size, free_format_bytes, buf_size, hdr - orig_buf, &frame_info)))

19
+            ret = callback(user_data, hdr, frame_size, free_format_bytes, buf_size, hdr - orig_buf, &frame_info);

20
+            if (ret != 0)

21
                 return ret;

22
         }

23
         buf      += frame_size;

24
@@ -562,7 +563,7 @@ int mp3dec_iterate_cb(mp3dec_io_t *io, uint8_t *buf, size_t buf_size, MP3D_ITERA

25
         readed += id3v2size;

26
     } else

27
     {

28
-        size_t readed = io->read(buf + MINIMP3_ID3_DETECT_SIZE, buf_size - MINIMP3_ID3_DETECT_SIZE, io->read_data);

29
+        readed = io->read(buf + MINIMP3_ID3_DETECT_SIZE, buf_size - MINIMP3_ID3_DETECT_SIZE, io->read_data);

30
         if (readed > (buf_size - MINIMP3_ID3_DETECT_SIZE))

31
             return MP3D_E_IOERROR;

32
         filled += readed;

33
@@ -590,7 +591,8 @@ int mp3dec_iterate_cb(mp3dec_io_t *io, uint8_t *buf, size_t buf_size, MP3D_ITERA

34
         readed += i;

35
         if (callback)

36
         {

37
-            if ((ret = callback(user_data, hdr, frame_size, free_format_bytes, filled - consumed, readed, &frame_info)))

38
+            ret = callback(user_data, hdr, frame_size, free_format_bytes, filled - consumed, readed, &frame_info);

39
+            if (ret != 0)

40
                 return ret;

41
         }

42
         readed += frame_size;

43
@@ -600,7 +602,7 @@ int mp3dec_iterate_cb(mp3dec_io_t *io, uint8_t *buf, size_t buf_size, MP3D_ITERA

44
             memmove(buf, buf + consumed, filled - consumed);

45
             filled -= consumed;

46
             consumed = 0;

47
-            size_t readed = io->read(buf + filled, buf_size - filled, io->read_data);

48
+            readed = io->read(buf + filled, buf_size - filled, io->read_data);

49
             if (readed > (buf_size - filled))

50
                 return MP3D_E_IOERROR;

51
             if (readed != (buf_size - filled))

52


53