aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPacketVideo CM <engbuild@pv.com>2010-06-23 14:06:50 -0700
committerPacketVideo CM <engbuild@pv.com>2010-06-23 14:31:04 -0700
commita74a87e140c4baeab8123352fc9e323b827df11f (patch)
tree4725eee6a1b3f96b140bce16c4ae0ac69e5fdfcc
parentecd97784b8186ab136f2dd97fcf496ed2fd78f63 (diff)
downloadopencore-a74a87e140c4baeab8123352fc9e323b827df11f.tar.gz
RIO-8722: Large File Support in MP4 PDL and PPB (minor follow-on)
Change-Id: Idaeeac21b8bd94ae62e31904da5f99629e0ee633
-rw-r--r--engines/2way/src/pv_2way_sdkinfo.h4
-rw-r--r--engines/author/src/pv_author_sdkinfo.h4
-rw-r--r--engines/player/src/pv_player_sdkinfo.h4
-rw-r--r--fileformats/mp4/parser/src/trackfragmentatom.cpp2
4 files changed, 7 insertions, 7 deletions
diff --git a/engines/2way/src/pv_2way_sdkinfo.h b/engines/2way/src/pv_2way_sdkinfo.h
index 7c5338392..a2995df8b 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 "1495892"
-#define PV2WAY_ENGINE_SDKINFO_DATE 0x20100614
+#define PV2WAY_ENGINE_SDKINFO_LABEL "1497117"
+#define PV2WAY_ENGINE_SDKINFO_DATE 0x20100615
#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 517f5c7d3..9549eec7f 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 "1495892"
-#define PVAUTHOR_ENGINE_SDKINFO_DATE 0x20100614
+#define PVAUTHOR_ENGINE_SDKINFO_LABEL "1497117"
+#define PVAUTHOR_ENGINE_SDKINFO_DATE 0x20100615
#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 03e3201fa..ff2f790d3 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 "1495892"
-#define PVPLAYER_ENGINE_SDKINFO_DATE 0x20100614
+#define PVPLAYER_ENGINE_SDKINFO_LABEL "1497117"
+#define PVPLAYER_ENGINE_SDKINFO_DATE 0x20100615
#endif //PV_PLAYER_SDKINFO_H_INCLUDED
diff --git a/fileformats/mp4/parser/src/trackfragmentatom.cpp b/fileformats/mp4/parser/src/trackfragmentatom.cpp
index 384969435..dbc30c157 100644
--- a/fileformats/mp4/parser/src/trackfragmentatom.cpp
+++ b/fileformats/mp4/parser/src/trackfragmentatom.cpp
@@ -812,7 +812,7 @@ TrackFragmentAtom::getNextNSamples(uint32 startSampleNum,
{
// if MBDS, may need to kick of a http request
TOsclFileOffset contentLength = AtomUtils::getContentLength(_pinput);
- if (((TOsclFileOffset)0 != contentLength) && ((sigmaSampleSize + sampleFileOffset) > contentLength))
+ if (((TOsclFileOffset)0 != contentLength) && ((TOsclFileOffset)(sigmaSampleSize + sampleFileOffset) > contentLength))
{
// do not skip beyond end of clip
// if content length is known