Ticket #452: compile.diff

configure

@@ -2714 +2714 @@
     typedef signed char int_fast8_t;
     typedef signed int  int_fast16_t;
     typedef signed int  int_fast32_t;
+    typedef signed long long int  int_fast64_t;
     typedef unsigned char uint_fast8_t;
     typedef unsigned int  uint_fast16_t;
-    typedef unsigned int  uint_fast32_t;'
+    typedef unsigned int  uint_fast32_t;
+    typedef unsigned long long int  uint_fast64_t;'
 fi
 echores "$_fast_inttypes"
 
@@ -6763 +6765 @@
   cat > $TMPC << EOF
 #include <sys/types.h>
 #include <sys/socket.h>
-int main(void) { socket(AF_INET6, SOCK_STREAM, AF_INET6); }
+#include <netinet/in.h>
+int main(void) { struct sockaddr_in6 six; socket(AF_INET6, SOCK_STREAM, AF_INET6); }
 EOF
   _inet6=no
   if cc_check ; then

libaf/af_resample.c

@@ -17 +17 @@
 #include "af.h"
 #include "dsp.h"
 
+// for PRI?64
+#include "../libavutil/common.h"
+
 /* Below definition selects the length of each poly phase component.
    Valid definitions are L8 and L16, where the number denotes the
    length of the filter. This definition affects the computational

libavformat/movenc.c

@@ -24 +24 @@
 #undef NDEBUG
 #include <assert.h>
 
+#if !defined(UINT32_MAX)
+#define UINT32_MAX      0xffffffffU
+#endif
+
 #define MOV_INDEX_CLUSTER_SIZE 16384
 #define globalTimescale 1000
 

libavutil/common.h

@@ -120 +120 @@
 #define PRIx64 "llx"
 #endif
 
+#ifndef PRIX64
+#define PRIX64 "llX"
+#endif
+
 #ifndef PRId32
 #define PRId32 "d"
 #endif

libmpdemux/aviheader.c

@@ -15 +15 @@
 #include "bswap.h"
 #include "aviheader.h"
 
+// for PRI?64
+#include "../libavutil/common.h"
+
 #define MIN(a,b) (((a)<(b))?(a):(b))
 
 

libmpdemux/aviprint.c

@@ -15 +15 @@
 //#include "codec-cfg.h"
 //#include "stheader.h"
 
+// for PRI?64
+#include "../libavutil/common.h"
+
 void print_avih_flags(MainAVIHeader *h){
   printf("MainAVIHeader.dwFlags: (%ld)%s%s%s%s%s%s\n",h->dwFlags,
     (h->dwFlags&AVIF_HASINDEX)?" HAS_INDEX":"",

libmpdemux/cache2.c

@@ -31 +31 @@
 
 #include "stream.h"
 
+// for PRI?64
+#include "../libavutil/common.h"
+
 int stream_fill_buffer(stream_t *s);
 int stream_seek_long(stream_t *s,off_t pos);
 

libmpdemux/demux_aac.c

@@ -14 +14 @@
 #include "bswap.h"
 #include "ms_hdr.h"
 
+// for PRI?64
+#include "../libavutil/common.h"
+
 typedef struct {
         uint8_t *buf;
         uint64_t size;  /// amount of time of data packets pushed to demuxer->audio (in bytes)

libmpdemux/demux_avi.c

@@ -14 +14 @@
 
 #include "aviheader.h"
 
+// for PRI?64
+#include "../libavutil/common.h"
+
 extern demuxer_t* init_avi_with_ogg(demuxer_t* demuxer);
 extern int demux_ogg_open(demuxer_t* demuxer);
 

libmpdemux/demux_lmlm4.c

@@ -18 +18 @@
 #include "stheader.h"
 #include "bswap.h"
 
+// for PRI?64
+#include "../libavutil/common.h"
+
 typedef struct __FrameInfo
 {
     ssize_t frameSize;

libmpdemux/demux_mkv.c

@@ -37 +37 @@
 #include "libmpcodecs/native/minilzo.h"
 #endif
 
+// for PRI?64
+#include "../libavutil/common.h"
+
 #if !defined(MIN)
 #define MIN(a, b)       ((a)<(b)?(a):(b))
 #endif

libmpdemux/demux_mov.c

@@ -35 +35 @@
 #include "qtpalette.h"
 #include "parse_mp4.h" // .MP4 specific stuff
 
+// for PRI?64
+#include "../libavutil/common.h"
+
 #ifdef MACOSX
 #include <QuickTime/QuickTime.h>
 #include <QuickTime/ImageCompression.h>

libmpdemux/demux_mpg.c

@@ -14 +14 @@
 #include "stheader.h"
 #include "mp3_hdr.h"
 
+// for PRI?64
+#include "../libavutil/common.h"
+
 //#define MAX_PS_PACKETSIZE 2048
 #define MAX_PS_PACKETSIZE (224*1024)
 

libmpdemux/demux_ogg.c

@@ -15 +15 @@
 #include "demuxer.h"
 #include "stheader.h"
 
+// for PRI?64
+#include "../libavutil/common.h"
+
 #define FOURCC_VORBIS mmioFOURCC('v', 'r', 'b', 's')
 #define FOURCC_SPEEX  mmioFOURCC('s', 'p', 'x', ' ')
 #define FOURCC_THEORA mmioFOURCC('t', 'h', 'e', 'o')

libmpdemux/demux_pva.c

@@ -32 +32 @@
 
 #include "bswap.h"
 
+// for PRI?64
+#include "../libavutil/common.h"
+
 /*
  * #defines below taken from PVA spec (see URL above)
  */

libmpdemux/demux_ts.c

@@ -39 +39 @@
 #include "ms_hdr.h"
 #include "mpeg_hdr.h"
 
+// for PRI?64
+#include "../libavutil/common.h"
+
 #define TS_PH_PACKET_SIZE 192
 #define TS_FEC_PACKET_SIZE 204
 #define TS_PACKET_SIZE 188

libmpdemux/demux_ty.c

@@ -45 +45 @@
 #include "stheader.h"
 #include "sub_cc.h"
 
+// for PRI?64
+#include "../libavutil/common.h"
+
 extern void skip_audio_frame( sh_audio_t *sh_audio );
 extern int sub_justify;
 

libmpdemux/demux_vqf.c

@@ -9 +9 @@
 #include "stheader.h"
 #include "libmpcodecs/vqf.h"
 
+// for PRI?64
+#include "../libavutil/common.h"
+
 static int demux_probe_vqf(demuxer_t* demuxer) 
 {
   char buf[KEYWORD_BYTES];

libmpdemux/muxer_mpeg.c

@@ -23 +23 @@
 #include "mp3_hdr.h"
 #include "liba52/a52.h"
 
+// for PRI?64
+#include "../libavutil/common.h"
+
 #define PACK_HEADER_START_CODE 0x01ba
 #define SYSTEM_HEADER_START_CODE 0x01bb
 #define PSM_START_CODE 0x01bc

libmpdemux/network.c

@@ -37 +37 @@
 
 #include "version.h"
 
+// for PRI?64
+#include "../libavutil/common.h"
+
 extern int verbose;
 extern int stream_cache_size;
 

libmpdemux/stream.c

@@ -31 +31 @@
 #include "m_option.h"
 #include "m_struct.h"
 
+// for PRI?64
+#include "../libavutil/common.h"
+
 
 extern int verbose; // defined in mplayer.c
 void cache_uninit(stream_t *s); // defined in cache2.c

libmpdemux/stream_file.c

@@ -13 +13 @@
 #include "m_option.h"
 #include "m_struct.h"
 
+// for PRI?64
+#include "../libavutil/common.h"
+
 static struct stream_priv_s {
   char* filename;
   char *filename2;

libmpdemux/stream_ftp.c

@@ -24 +24 @@
 #include "m_option.h"
 #include "m_struct.h"
 
+// for PRI?64
+#include "../libavutil/common.h"
+
 static struct stream_priv_s {
   char* user;
   char* pass;

libvo/vo_jpeg.c

@@ -200 +200 @@
     jpeg_set_defaults(&cinfo);
     /* Important: Header info must be set AFTER jpeg_set_defaults() */
     cinfo.write_JFIF_header = TRUE;
+    /*
     cinfo.JFIF_major_version = 1;
     cinfo.JFIF_minor_version = 2;
+    */
     cinfo.density_unit = 1; /* 0=unknown, 1=dpi, 2=dpcm */
     /* Image DPI is determined by Y_density, so we leave that at
        jpeg_dpi if possible and crunch X_density instead (PAR > 1) */

m_option.c

@@ -12 +12 @@
 //#include "m_config.h"
 #include "mp_msg.h"
 #include "libmpdemux/url.h"
+// for PRId64
+#include "libavutil/common.h"
 
 // Don't free for 'production' atm
 #ifndef MP_DEBUG