From 3a9a27628560f14146c4e37e8ed9eb2adde33071 Mon Sep 17 00:00:00 2001
From: Brad Smith <brad@comstyle.com>
Date: Sun, 13 Nov 2011 06:18:00 +0000
Subject: Need sys/stat.h for file audio output code to build on OpenBSD

---
 src/audio_out/audio_file_out.c | 1 +
 1 file changed, 1 insertion(+)

(limited to 'src')

diff --git a/src/audio_out/audio_file_out.c b/src/audio_out/audio_file_out.c
index 0895a2eac..f4006b849 100644
--- a/src/audio_out/audio_file_out.c
+++ b/src/audio_out/audio_file_out.c
@@ -30,6 +30,7 @@
 #include <math.h>
 #include <unistd.h>
 #include <inttypes.h>
+#include <sys/stat.h>
 
 #include "xine_internal.h"
 #include "xineutils.h"
-- 
cgit v1.2.3


From 3f7f6a10d91caff5ca0ab6b90a9700c7f33311f2 Mon Sep 17 00:00:00 2001
From: Mark Brand <mabrand@mabrand.nl>
Date: Sun, 13 Nov 2011 12:05:22 +0100
Subject: fake missing definitions for WIN32 --- 
 src/audio_out/audio_file_out.c |   13 ++++++++++++-  1 files changed, 12
 insertions(+), 1 deletions(-)

---
 src/audio_out/audio_file_out.c | 12 ++++++++++++
 1 file changed, 12 insertions(+)

(limited to 'src')

diff --git a/src/audio_out/audio_file_out.c b/src/audio_out/audio_file_out.c
index f4006b849..802461e0e 100644
--- a/src/audio_out/audio_file_out.c
+++ b/src/audio_out/audio_file_out.c
@@ -41,6 +41,18 @@
 
 #define GAP_TOLERANCE        INT_MAX
 
+#ifdef WIN32
+#ifndef S_IWUSR
+#define S_IWUSR 0x0000
+#endif
+#ifndef S_IRGRP
+#define S_IRGRP 0x0000
+#endif
+#ifndef S_IROTH
+#define S_IROTH 0x0000
+#endif
+#endif
+
 /* Taken (hStudlyCapsAndAll) from sox's wavwritehdr */
 
 struct wavhdr {
-- 
cgit v1.2.3


From 817593b5183d6bd79c62dbc31de2f24d74a288b3 Mon Sep 17 00:00:00 2001
From: Petri Hintukainen <phintuka@users.sourceforge.net>
Date: Fri, 18 Nov 2011 15:36:17 +0200
Subject: Fixed building with internal ffmpeg

---
 src/combined/ffmpeg/ff_audio_decoder.c | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'src')

diff --git a/src/combined/ffmpeg/ff_audio_decoder.c b/src/combined/ffmpeg/ff_audio_decoder.c
index 3b810a3fa..4195b7b95 100644
--- a/src/combined/ffmpeg/ff_audio_decoder.c
+++ b/src/combined/ffmpeg/ff_audio_decoder.c
@@ -173,6 +173,7 @@ static void ff_audio_init_codec(ff_audio_decoder_t *this, unsigned int codec_typ
    *  - DVB streams where multiple AAC LATM frames are packed to single PES
    *  - DVB streams where MPEG audio frames do not follow PES packet boundaries
    */
+#if LIBAVCODEC_VERSION_MAJOR >= 53
   if (codec_type == BUF_AUDIO_AAC_LATM ||
       codec_type == BUF_AUDIO_MPEG) {
 
@@ -185,6 +186,7 @@ static void ff_audio_init_codec(ff_audio_decoder_t *this, unsigned int codec_typ
                "ffmpeg_audio_dec: couldn't init parser\n");
     }
   }
+#endif
 }
 
 static int ff_audio_open_codec(ff_audio_decoder_t *this, unsigned int codec_type) {
@@ -354,6 +356,7 @@ static int ff_audio_decode(xine_t *xine,
   int consumed;
   int parser_consumed = 0;
 
+#if LIBAVCODEC_VERSION_MAJOR >= 53
   if (parser_ctx) {
     uint8_t *outbuf;
     int      outsize;
@@ -380,6 +383,7 @@ static int ff_audio_decode(xine_t *xine,
     buf  = outbuf;
     size = outsize;
   }
+#endif /* LIBAVCODEC_VERSION_MAJOR >= 53 */
 
 #if AVAUDIO > 2
   AVPacket avpkt;
-- 
cgit v1.2.3