summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDiego 'Flameeyes' Pettenò <flameeyes@gmail.com>2007-05-31 19:43:30 +0200
committerDiego 'Flameeyes' Pettenò <flameeyes@gmail.com>2007-05-31 19:43:30 +0200
commitc6c900ac497ccb751bb35c9f913ad62395003f74 (patch)
treed0e801ae2aded1c17b48bfdcf5162221da4110e7
parent19f41dd6d7d81c10b3f329faa1c895c8b322548d (diff)
parent8a926cfe43464c804fbf4fe9e4dba479fc2e0cc0 (diff)
downloadxine-lib-c6c900ac497ccb751bb35c9f913ad62395003f74.tar.gz
xine-lib-c6c900ac497ccb751bb35c9f913ad62395003f74.tar.bz2
Merge.
-rw-r--r--src/demuxers/demux_qt.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/demuxers/demux_qt.c b/src/demuxers/demux_qt.c
index 0624dc673..23a45c792 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')
@@ -1987,7 +1988,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++;