Mercurial > mplayer.hg
comparison libmpdemux/demux_mkv.cpp @ 10029:2d31643a3c22
Fixes for gcc 3.2
| author | mosu |
|---|---|
| date | Wed, 30 Apr 2003 19:35:28 +0000 |
| parents | 7ca8b302032f |
| children | 1dfe4dab4a42 |
comparison
equal
deleted
inserted
replaced
| 10028:7ca8b302032f | 10029:2d31643a3c22 |
|---|---|
| 1148 f_default.ReadData(es->I_O()); | 1148 f_default.ReadData(es->I_O()); |
| 1149 track->default_track = uint32(f_default); | 1149 track->default_track = uint32(f_default); |
| 1150 mp_msg(MSGT_DEMUX, MSGL_V, "[mkv] | + Default flag: %u\n", | 1150 mp_msg(MSGT_DEMUX, MSGL_V, "[mkv] | + Default flag: %u\n", |
| 1151 track->default_track); | 1151 track->default_track); |
| 1152 | 1152 |
| 1153 } else if ((EbmlId(*l3) != | 1153 } else if ((!(EbmlId(*l3) == |
| 1154 KaxTrackFlagLacing::ClassInfos.GlobalId) && | 1154 KaxTrackFlagLacing::ClassInfos.GlobalId)) && |
| 1155 (EbmlId(*l3) != | 1155 (!(EbmlId(*l3) == |
| 1156 KaxTrackMinCache::ClassInfos.GlobalId) && | 1156 KaxTrackMinCache::ClassInfos.GlobalId)) && |
| 1157 (EbmlId(*l3) != | 1157 (!(EbmlId(*l3) == |
| 1158 KaxTrackMaxCache::ClassInfos.GlobalId)) | 1158 KaxTrackMaxCache::ClassInfos.GlobalId))) |
| 1159 mp_msg(MSGT_DEMUX, MSGL_V, "[mkv] | + unknown element@3: " | 1159 mp_msg(MSGT_DEMUX, MSGL_V, "[mkv] | + unknown element@3: " |
| 1160 "%s\n", typeid(*l3).name()); | 1160 "%s\n", typeid(*l3).name()); |
| 1161 | 1161 |
| 1162 if (upper_lvl_el > 0) { // we're coming from l4 | 1162 if (upper_lvl_el > 0) { // we're coming from l4 |
| 1163 upper_lvl_el--; | 1163 upper_lvl_el--; |