Merged revision(s) 19891 from trunk/OpenMPT:

[Ref] vorbis: Apply <xiph/vorbis#100> and <xiph/vorbis#101>.
........


git-svn-id: https://source.openmpt.org/svn/openmpt/branches/OpenMPT-1.30@19893 56274372-70c3-4bfc-bfc3-4c3a0b034d27

include/vorbis/OpenMPT.txt

@@ -3,8 +3,8 @@ The following changes have been made:
 - Obviously, unnecessary folders and files (doc, examples, m4, macos, macosx,
   symbian, test, vq) have been removed.
 - Building for DJGPP has been fixed.
-- lib/block.c: -Wmisleading-indentation warning has been fixed.
-- lib/vorbisfile.c: -Wstrict-prototypes warning has been fixed.
+- https://github.com/xiph/vorbis/pull/100 and
+  https://github.com/xiph/vorbis/pull/101 have been applied.
 - All modifications have been marked with /* OpenMPT */.
 - For building, premake is used to generate Visual Studio project files.
   See ../build/premake/ for details.

include/vorbis/lib/block.c

@@ -392,15 +392,9 @@ float **vorbis_analysis_buffer(vorbis_dsp_state *v, int vals){
   private_state *b=v->backend_state;
 
   /* free header, header1, header2 */
-#if 0  /* OpenMPT */
-  if(b->header)_ogg_free(b->header);b->header=NULL;
-  if(b->header1)_ogg_free(b->header1);b->header1=NULL;
-  if(b->header2)_ogg_free(b->header2);b->header2=NULL;
-#else  /* OpenMPT */
   if(b->header){_ogg_free(b->header);b->header=NULL;}
   if(b->header1){_ogg_free(b->header1);b->header1=NULL;}
   if(b->header2){_ogg_free(b->header2);b->header2=NULL;}
-#endif  /* OpenMPT */
 
   /* Do we have enough storage space for the requested buffer? If not,
      expand the PCM (and envelope) storage */

include/vorbis/lib/vorbisfile.c

@@ -1910,11 +1910,7 @@ vorbis_comment *ov_comment(OggVorbis_File *vf,int link){
   }
 }
 
-#if 0  /* OpenMPT */
-static int host_is_big_endian() {
-#else  /* OpenMPT */
-static int host_is_big_endian(void) {  /* OpenMPT */
-#endif  /* OpenMPT */
+static int host_is_big_endian(void) {
   ogg_int32_t pattern = 0xfeedface; /* deadbeef */
   unsigned char *bytewise = (unsigned char *)&pattern;
   if (bytewise[0] == 0xfe) return 1;