diff options
| author | Petri Hintukainen <phintuka@users.sourceforge.net> | 2011-11-23 12:29:44 +0200 |
|---|---|---|
| committer | Petri Hintukainen <phintuka@users.sourceforge.net> | 2011-11-23 12:29:44 +0200 |
| commit | 1878fabbf2a7729ef06d7484a6cc2efebfbbd75b (patch) | |
| tree | bafb67450270e12646e262c835e89e2a2150abd1 | |
| parent | aee4fbde84e1d7c06879415067d3625d01df0f36 (diff) | |
| parent | 817593b5183d6bd79c62dbc31de2f24d74a288b3 (diff) | |
| download | xine-lib-1878fabbf2a7729ef06d7484a6cc2efebfbbd75b.tar.gz xine-lib-1878fabbf2a7729ef06d7484a6cc2efebfbbd75b.tar.bz2 | |
Merge from 1.1
| -rw-r--r-- | src/audio_out/audio_file_out.c | 13 | ||||
| -rw-r--r-- | src/combined/ffmpeg/ff_audio_decoder.c | 4 |
2 files changed, 17 insertions, 0 deletions
diff --git a/src/audio_out/audio_file_out.c b/src/audio_out/audio_file_out.c index c8fe51f72..4f4e6bc47 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/xine_internal.h> #include <xine/xineutils.h> @@ -40,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 { diff --git a/src/combined/ffmpeg/ff_audio_decoder.c b/src/combined/ffmpeg/ff_audio_decoder.c index 8d7cc1574..6b524e80c 100644 --- a/src/combined/ffmpeg/ff_audio_decoder.c +++ b/src/combined/ffmpeg/ff_audio_decoder.c @@ -172,6 +172,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) { @@ -184,6 +185,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) { @@ -353,6 +355,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; @@ -379,6 +382,7 @@ static int ff_audio_decode(xine_t *xine, buf = outbuf; size = outsize; } +#endif /* LIBAVCODEC_VERSION_MAJOR >= 53 */ #if AVAUDIO > 2 AVPacket avpkt; |