Magellan Linux

  • Back to homepage
    • /[pkg-src]/trunk/xine-lib/patches/xine-lib-1.1.1-faad-64bit.patch

    Contents of /trunk/xine-lib/patches/xine-lib-1.1.1-faad-64bit.patch

    Parent Directory Parent Directory | Revision Log Revision Log

    Revision 153 - (show annotations) (download)
    Tue May 8 20:52:56 2007 UTC (17 years ago) by niro
    File size: 1538 byte(s) 
    -import
    1 Index: xine-lib-1.1.1/src/libfaad/xine_decoder.c
    2 ===================================================================
    3 --- xine-lib-1.1.1.orig/src/libfaad/xine_decoder.c
    4 +++ xine-lib-1.1.1/src/libfaad/xine_decoder.c
    5 @@ -38,7 +38,12 @@
    6 #include "audio_out.h"
    7 #include "buffer.h"
    8 #include "xineutils.h"
    9 -#include "faad.h"
    10 +#include "common.h"
    11 +#include "structs.h"
    12 +#include "decoder.h"
    13 +#include "syntax.h"
    14 +
    15 +#define FAAD_MIN_STREAMSIZE 768 /* 6144 bits/channel */
    16
    17 typedef struct {
    18 audio_decoder_class_t decoder_class;
    19 @@ -50,9 +55,9 @@ typedef struct faad_decoder_s {
    20 xine_stream_t *stream;
    21
    22 /* faad2 stuff */
    23 - faacDecHandle faac_dec;
    24 - faacDecConfigurationPtr faac_cfg;
    25 - faacDecFrameInfo faac_finfo;
    26 + NeAACDecHandle faac_dec;
    27 + NeAACDecConfigurationPtr faac_cfg;
    28 + NeAACDecFrameInfo faac_finfo;
    29 int faac_failed;
    30
    31 int raw_mode;
    32 @@ -66,7 +71,7 @@ typedef struct faad_decoder_s {
    33 unsigned char *dec_config;
    34 int dec_config_size;
    35
    36 - unsigned long rate;
    37 + uint32_t rate;
    38 int bits_per_sample;
    39 unsigned char num_channels;
    40 int sbr;
    41 Index: xine-lib-1.1.1/src/libfaad/Makefile.am
    42 ===================================================================
    43 --- xine-lib-1.1.1.orig/src/libfaad/Makefile.am
    44 +++ xine-lib-1.1.1/src/libfaad/Makefile.am
    45 @@ -66,7 +66,6 @@ noinst_HEADERS = \
    46 drc.h \
    47 drm_dec.h \
    48 error.h \
    49 - faad.h \
    50 filtbank.h \
    51 fixed.h \
    52 huffman.h \