diff options
| -rw-r--r-- | src/demuxers/demux_qt.c | 4 | ||||
| -rw-r--r-- | src/libxineadec/xine_mad_decoder.c | 9 |
2 files changed, 10 insertions, 3 deletions
diff --git a/src/demuxers/demux_qt.c b/src/demuxers/demux_qt.c index cff4c48f9..1b82a288d 100644 --- a/src/demuxers/demux_qt.c +++ b/src/demuxers/demux_qt.c @@ -121,6 +121,7 @@ typedef unsigned int qt_atom; #define WRT_ATOM QT_ATOM(0xA9, 'w', 'r', 't') #define DAY_ATOM QT_ATOM(0xA9, 'd', 'a', 'y') +#define RMRA_ATOM QT_ATOM('r', 'm', 'r', 'a') #define RMDA_ATOM QT_ATOM('r', 'm', 'd', 'a') #define RDRF_ATOM QT_ATOM('r', 'd', 'r', 'f') #define RMDR_ATOM QT_ATOM('r', 'm', 'd', 'r') @@ -1984,7 +1985,8 @@ static void parse_moov_atom(qt_info *info, unsigned char *moov_atom, strncpy(info->comment, &moov_atom[i + 8], string_size - 1); info->comment[string_size - 1] = 0; - } else if (current_atom == RMDA_ATOM) { + } else if (current_atom == RMDA_ATOM || + current_atom == RMRA_ATOM) { /* create a new reference structure */ info->reference_count++; diff --git a/src/libxineadec/xine_mad_decoder.c b/src/libxineadec/xine_mad_decoder.c index 28407cfec..98695db68 100644 --- a/src/libxineadec/xine_mad_decoder.c +++ b/src/libxineadec/xine_mad_decoder.c @@ -39,10 +39,15 @@ #include "xine_internal.h" #include "audio_out.h" #include "buffer.h" -#include "frame.h" -#include "synth.h" #include "xineutils.h" +#ifdef HAVE_MAD_H +# include <mad.h> +#else +# include "frame.h" +# include "synth.h" +#endif + #define INPUT_BUF_SIZE 16384 typedef struct { |