diff options
| -rw-r--r-- | ChangeLog | 2 | ||||
| -rw-r--r-- | src/libffmpeg/libavcodec/libpostproc/mangle.h | 2 |
2 files changed, 3 insertions, 1 deletions
@@ -42,7 +42,7 @@ xine-lib (1.1.5) (Unreleased) * Fix support of block devices for AC3 and DTS demuxers. Thanks to Matthias Kretz for the original patch. * Portability fixes for Mac OS X, in particular Mac OS X on the new Intel - Macs. Thanks to Martin Aumueller and Emanuele Giaquinta. + Macs. Thanks to Martin Aumueller, Emanuele Giaquinta and Matt Messier. * Fix amp muting when level is still at 100. Patch by Reinhard Nissl. * Create at least a 1×1 shared image when the first frame is skipped (and thus reported as 0×0), to avoid disabling shared memory for all others. diff --git a/src/libffmpeg/libavcodec/libpostproc/mangle.h b/src/libffmpeg/libavcodec/libpostproc/mangle.h index aa09cd6bf..46480ab43 100644 --- a/src/libffmpeg/libavcodec/libpostproc/mangle.h +++ b/src/libffmpeg/libavcodec/libpostproc/mangle.h @@ -19,6 +19,8 @@ #else #if defined(ARCH_X86_64) && defined(PIC) #define MANGLE(a) #a"(%%rip)" +#elif defined(CONFIG_DARWIN) +#define MANGLE(a) "_" #a #else #define MANGLE(a) #a #endif |