Packman Build Service PMBS

Changes of Revision 6

oggvideotools.patch Changed

@@ -1,3 +1,25 @@
+--- a/src/binaries/oggThumb.cpp
++++ b/src/binaries/oggThumb.cpp
+@@ -262,7 +262,8 @@ int oggThumbCmd(int argc, char* argv[])
+       /* has_arg: */    1,
+       /* flag:    */    NULL,
+       /* val:     */    opt_verbose
+-    }
++    },
++    {0},
+   };
+ //#endif
+ 
+--- a/src/effect/lowpassEffect.cpp
++++ b/src/effect/lowpassEffect.cpp
+@@ -70,6 +70,7 @@ Effector & LowpassEffect::operator >>(RG
+   }
+ 
+ 
++ return *this;
+ }
+ 
+ void LowpassEffect::doBlindIn(RGBPlane & plane)
 --- a/src/main/audioHook.cpp
 +++ b/src/main/audioHook.cpp
 @@ -97,6 +97,7 @@ HookHandler& AudioHook::operator<<(OggPa
@@ -8,13 +30,35 @@
  }
  
  void AudioHook::flush()
---- a/src/effect/lowpassEffect.cpp
-+++ b/src/effect/lowpassEffect.cpp
-@@ -70,6 +70,7 @@ Effector & LowpassEffect::operator >>(RG
-   }
+--- a/src/main/oggBOSExtractorFactory.cpp
++++ b/src/main/oggBOSExtractorFactory.cpp
+@@ -116,6 +116,9 @@ OggType OggBOSExtractorFactory::getStrea
+ {
+   uint8* type = &(page->data())[0]+page->getHeaderLength();
  
++  if (NULL == OggTypeMap || NULL == type)
++    return (OggType::unknown);
++
+   uint8 i=1;
+   for (; i< to_integral(OggType::maxOggType); ++i) {
+     if (memcmp(type, OggTypeMap[i], MAXIDCHARS) == 0)
+@@ -131,6 +134,9 @@ OggType OggBOSExtractorFactory::getStrea
+ {
+   uint8* type = packet->data();
  
-+ return *this;
++  if (NULL == OggTypeMap || NULL == type)
++    return (OggType::unknown);
++
+   uint8 i=1;
+   for (; i< to_integral(OggType::maxOggType); ++i) {
+     if (memcmp(type, OggTypeMap[i], MAXIDCHARS) == 0)
+--- a/src/ovt_theora/theoraStreamParameter.cpp
++++ b/src/ovt_theora/theoraStreamParameter.cpp
+@@ -5,6 +5,7 @@
+ #include "log.h"
+ 
+ TheoraStreamParameter::TheoraStreamParameter()
++  : colorspace(unspecified)
+ {
  }
  
- void LowpassEffect::doBlindIn(RGBPlane & plane)