[Openh323-cvs] opal/src/opal mediafmt.cxx,2.27,2.28 mediastrm.cxx,2.28,2.29

[Craig S. <cso...@us...>]

Update of /cvsroot/openh323/opal/src/opal
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5592/src/opal

Modified Files:
	mediafmt.cxx mediastrm.cxx 
Log Message:
Fixed problems with STL compatibility on MSVC 6
Fixed problems with video streams
Thanks to Adrian Sietsma

Index: mediastrm.cxx
===================================================================
RCS file: /cvsroot/openh323/opal/src/opal/mediastrm.cxx,v
retrieving revision 2.28
retrieving revision 2.29
diff -C2 -d -r2.28 -r2.29
*** mediastrm.cxx	2 Oct 2004 11:50:58 -0000	2.28
--- mediastrm.cxx	12 Mar 2005 00:33:28 -0000	2.29
***************
*** 25,28 ****
--- 25,33 ----
   *
   * $Log$
+  * Revision 2.29  2005/03/12 00:33:28  csoutheren
+  * Fixed problems with STL compatibility on MSVC 6
+  * Fixed problems with video streams
+  * Thanks to Adrian Sietsma
+  *
   * Revision 2.28  2004/10/02 11:50:58  rjongbloed
   * Fixed RTP media stream so assures RTP session is open before starting.
***************
*** 703,707 ****
  
    if (in != NULL)
!     SetDataSize(sizeof(OpalVideoTranscoder::FrameHeader)+in->GetMaxFrameBytes());
  }
  
--- 708,712 ----
  
    if (in != NULL)
!     SetDataSize(in->GetMaxFrameBytes());
  }
  
***************
*** 716,719 ****
--- 721,730 ----
  
  
+ BOOL OpalVideoMediaStream::SetDataSize(PINDEX dataSize)
+ { 
+   return OpalMediaStream::SetDataSize(sizeof(OpalVideoTranscoder::FrameHeader)+dataSize); 
+ }
+ 
+ 
  BOOL OpalVideoMediaStream::Open()
  {

Index: mediafmt.cxx
===================================================================
RCS file: /cvsroot/openh323/opal/src/opal/mediafmt.cxx,v
retrieving revision 2.27
retrieving revision 2.28
diff -C2 -d -r2.27 -r2.28
*** mediafmt.cxx	21 Feb 2005 20:27:18 -0000	2.27
--- mediafmt.cxx	12 Mar 2005 00:33:28 -0000	2.28
***************
*** 25,28 ****
--- 25,33 ----
   *
   * $Log$
+  * Revision 2.28  2005/03/12 00:33:28  csoutheren
+  * Fixed problems with STL compatibility on MSVC 6
+  * Fixed problems with video streams
+  * Thanks to Adrian Sietsma
+  *
   * Revision 2.27  2005/02/21 20:27:18  dsandras
   * Fixed compilation with gcc.
***************
*** 331,335 ****
  
    m_value = m_enumerations.GetSize();
!   strm.setstate(ios::badbit);
  }
  
--- 336,345 ----
  
    m_value = m_enumerations.GetSize();
! 
! #if __USE_STL__
!    strm.setstate(ios::badbit);
! #else
!    strm.setf(ios::badbit , ios::badbit);
! #endif
  }