diff options
| author | PacketVideo CM <engbuild@pv.com> | 2010-06-15 16:36:00 -0700 |
|---|---|---|
| committer | PacketVideo CM <engbuild@pv.com> | 2010-06-15 16:36:00 -0700 |
| commit | 7a6f46bccc46d3d47abb93b7b7a992d0e95a2938 (patch) | |
| tree | 8c4847d0a0369a5f7f379596c649003df4371894 | |
| parent | 1b7dfa1f3dcf23cd577e92a0e49df00f32ecf187 (diff) | |
| download | opencore-7a6f46bccc46d3d47abb93b7b7a992d0e95a2938.tar.gz | |
RIO-9285: Fixed track fragment atom parsing to allow UUID atom
Change-Id: Ibf1d0995170a307095862fd7e9b5f5e09224c654
| -rw-r--r-- | engines/2way/src/pv_2way_sdkinfo.h | 2 | ||||
| -rw-r--r-- | engines/author/src/pv_author_sdkinfo.h | 2 | ||||
| -rw-r--r-- | engines/player/src/pv_player_sdkinfo.h | 2 | ||||
| -rw-r--r-- | fileformats/mp4/parser/src/mpeg4file.cpp | 3 |
4 files changed, 4 insertions, 5 deletions
diff --git a/engines/2way/src/pv_2way_sdkinfo.h b/engines/2way/src/pv_2way_sdkinfo.h index d77607a19..01fd9897e 100644 --- a/engines/2way/src/pv_2way_sdkinfo.h +++ b/engines/2way/src/pv_2way_sdkinfo.h @@ -21,7 +21,7 @@ // This header file is automatically generated at build-time // *** OFFICIAL RELEASE INFO -- Will not auto update -#define PV2WAY_ENGINE_SDKINFO_LABEL "1475805" +#define PV2WAY_ENGINE_SDKINFO_LABEL "1477378" #define PV2WAY_ENGINE_SDKINFO_DATE 0x20100603 #endif //PV_2WAY_SDKINFO_H_INCLUDED diff --git a/engines/author/src/pv_author_sdkinfo.h b/engines/author/src/pv_author_sdkinfo.h index 1832fe51f..b9a93883e 100644 --- a/engines/author/src/pv_author_sdkinfo.h +++ b/engines/author/src/pv_author_sdkinfo.h @@ -21,7 +21,7 @@ // This header file is automatically generated at build-time // *** OFFICIAL RELEASE INFO -- Will not auto update -#define PVAUTHOR_ENGINE_SDKINFO_LABEL "1475805" +#define PVAUTHOR_ENGINE_SDKINFO_LABEL "1477378" #define PVAUTHOR_ENGINE_SDKINFO_DATE 0x20100603 #endif //PV_AUTHOR_SDKINFO_H_INCLUDED diff --git a/engines/player/src/pv_player_sdkinfo.h b/engines/player/src/pv_player_sdkinfo.h index d8a5f4bc0..24934ad71 100644 --- a/engines/player/src/pv_player_sdkinfo.h +++ b/engines/player/src/pv_player_sdkinfo.h @@ -21,7 +21,7 @@ // This header file is automatically generated at build-time // *** OFFICIAL RELEASE INFO -- Will not auto update -#define PVPLAYER_ENGINE_SDKINFO_LABEL "1475805" +#define PVPLAYER_ENGINE_SDKINFO_LABEL "1477378" #define PVPLAYER_ENGINE_SDKINFO_DATE 0x20100603 #endif //PV_PLAYER_SDKINFO_H_INCLUDED diff --git a/fileformats/mp4/parser/src/mpeg4file.cpp b/fileformats/mp4/parser/src/mpeg4file.cpp index 7efe444a9..de3cadb6d 100644 --- a/fileformats/mp4/parser/src/mpeg4file.cpp +++ b/fileformats/mp4/parser/src/mpeg4file.cpp @@ -119,7 +119,7 @@ Mpeg4File::Mpeg4File(MP4_FF_FILE *fp, numLyricist = 0; numComposer = 0; numVersion = 0; - iTotalMoofAtmsCnt = 0xFFFFFFFF;//Zero is a chosen to be sentinal because 0 is invalid value if mvex atom is present. + iTotalMoofAtmsCnt = 0xFFFFFFFF; // Create miscellaneous vector of atoms PV_MP4_FF_NEW(fp->auditCB, trackAtomVecType, (), _pTrackAtomVec); PV_MP4_FF_NEW(fp->auditCB, movieFragmentAtomVecType, (), _pMovieFragmentAtomVec); @@ -2661,7 +2661,6 @@ int32 Mpeg4File::getNextBundledAccessUnits(const uint32 trackID, { TOsclFileOffset moofStartOffset = AtomUtils::getCurrentFilePosition(_movieFragmentFilePtr); moofStartOffset -= DEFAULT_ATOM_SIZE; - parseMoofCompletely = false; moofSize = atomSize; moofType = atomType; moofCount = count; |