Mercurial > mplayer.hg
comparison libmpdemux/demux_mkv.cpp @ 10638:9d0b8330a683
Fixes for compilation with gcc versions != 3.2.
author | mosu |
---|---|
date | Sun, 17 Aug 2003 10:36:33 +0000 |
parents | b6a31ca4f9a2 |
children | 99eb26749a14 |
comparison
equal
deleted
inserted
replaced
10637:b6a31ca4f9a2 | 10638:9d0b8330a683 |
---|---|
962 return 0; | 962 return 0; |
963 } | 963 } |
964 es = mkv_d->es; | 964 es = mkv_d->es; |
965 | 965 |
966 // Find the EbmlHead element. Must be the first one. | 966 // Find the EbmlHead element. Must be the first one. |
967 l0 = es->FindNextID(EbmlHead::ClassInfos, 0xFFFFFFFFFFFFFFFFL); | 967 l0 = es->FindNextID(EbmlHead::ClassInfos, 0xFFFFFFFFFFFFFFFFULL); |
968 if (l0 == NULL) { | 968 if (l0 == NULL) { |
969 mp_msg(MSGT_DEMUX, MSGL_ERR, "[mkv] no head found\n"); | 969 mp_msg(MSGT_DEMUX, MSGL_ERR, "[mkv] no head found\n"); |
970 free_mkv_demuxer(mkv_d); | 970 free_mkv_demuxer(mkv_d); |
971 return 0; | 971 return 0; |
972 } | 972 } |
974 l0->SkipData(static_cast<EbmlStream &>(*es), l0->Generic().Context); | 974 l0->SkipData(static_cast<EbmlStream &>(*es), l0->Generic().Context); |
975 delete l0; | 975 delete l0; |
976 mp_msg(MSGT_DEMUX, MSGL_V, "[mkv] Found the head...\n"); | 976 mp_msg(MSGT_DEMUX, MSGL_V, "[mkv] Found the head...\n"); |
977 | 977 |
978 // Next element must be a segment | 978 // Next element must be a segment |
979 l0 = es->FindNextID(KaxSegment::ClassInfos, 0xFFFFFFFFFFFFFFFFL); | 979 l0 = es->FindNextID(KaxSegment::ClassInfos, 0xFFFFFFFFFFFFFFFFULL); |
980 if (l0 == NULL) { | 980 if (l0 == NULL) { |
981 mp_msg(MSGT_DEMUX, MSGL_V, "[mkv] but no segment :(\n"); | 981 mp_msg(MSGT_DEMUX, MSGL_V, "[mkv] but no segment :(\n"); |
982 free_mkv_demuxer(mkv_d); | 982 free_mkv_demuxer(mkv_d); |
983 return 0; | 983 return 0; |
984 } | 984 } |