summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorMike Melanson <mike@multimedia.cx>2004-05-30 01:33:59 +0000
committerMike Melanson <mike@multimedia.cx>2004-05-30 01:33:59 +0000
commit7352d54dfb66a7ed584a563653f1525c9a7ee922 (patch)
tree793534f3c6b49271c4ea2a5a7053175c09b7bb35 /src
parent3cd9d4ab79cb7ad92f60a3ce6e523f1ff9ce4d09 (diff)
downloadxine-lib-7352d54dfb66a7ed584a563653f1525c9a7ee922.tar.gz
xine-lib-7352d54dfb66a7ed584a563653f1525c9a7ee922.tar.bz2
special provision for 'samr', another codec that doesn't play by the
rules CVS patchset: 6609 CVS date: 2004/05/30 01:33:59
Diffstat (limited to 'src')
-rw-r--r--src/demuxers/demux_qt.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/demuxers/demux_qt.c b/src/demuxers/demux_qt.c
index 30abba3d8..169d51730 100644
--- a/src/demuxers/demux_qt.c
+++ b/src/demuxers/demux_qt.c
@@ -30,7 +30,7 @@
* build_frame_table
* free_qt_info
*
- * $Id: demux_qt.c,v 1.182 2004/05/16 18:01:44 tmattern Exp $
+ * $Id: demux_qt.c,v 1.183 2004/05/30 01:33:59 tmmm Exp $
*
*/
@@ -94,6 +94,7 @@ typedef unsigned int qt_atom;
#define IMA4_FOURCC QT_ATOM('i', 'm', 'a', '4')
#define MP4A_FOURCC QT_ATOM('m', 'p', '4', 'a')
+#define SAMR_FOURCC QT_ATOM('s', 'a', 'm', 'r')
#define DRMS_FOURCC QT_ATOM('d', 'r', 'm', 's')
#define TWOS_FOURCC QT_ATOM('t', 'w', 'o', 's')
#define SOWT_FOURCC QT_ATOM('s', 'o', 'w', 't')
@@ -1118,6 +1119,9 @@ static qt_error parse_trak_atom (qt_trak *trak,
if (BE_32(&trak_atom[atom_pos + 0x0]) == MP4A_FOURCC)
trak->stsd_atoms[k].audio.vbr = 1;
+ if (BE_32(&trak_atom[atom_pos + 0x0]) == SAMR_FOURCC)
+ trak->stsd_atoms[k].audio.vbr = 1;
+
if (BE_32(&trak_atom[atom_pos + 0x0]) == DRMS_FOURCC) {
last_error = QT_DRM_NOT_SUPPORTED;
goto free_trak;