Rebased to SVN revision 3487

mastertheknife · Feb 1, 2012 · b51bce0 · b51bce0
1 parent be8ef02
commit b51bce0
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 33 deletions.
diff --git a/config.h.in b/config.h.in
@@ -180,24 +180,24 @@
 /* Define to 1 if you have the <pcre/pcre.h> header file. */
 #undef HAVE_PCRE_PCRE_H
 
-/* Define to 1 if you have the <pthread.h> header file. */
-#undef HAVE_PTHREAD_H
-
 /* Define to 1 if you have the `posix_memalign' function. */
 #undef HAVE_POSIX_MEMALIGN
 
+/* Define to 1 if you have the <pthread.h> header file. */
+#undef HAVE_PTHREAD_H
+
 /* Define to 1 if you have the `putenv' function. */
 #undef HAVE_PUTENV
 
 /* Define to 1 if you have the `select' function. */
 #undef HAVE_SELECT
 
-/* Define to 1 if you have the `sigaction' function. */
-#undef HAVE_SIGACTION
-
 /* Define to 1 if you have the `sendfile' function. */
 #undef HAVE_SENDFILE
 
+/* Define to 1 if you have the `sigaction' function. */
+#undef HAVE_SIGACTION
+
 /* Define to 1 if the system has the type `siginfo_t'. */
 #undef HAVE_SIGINFO_T
 

diff --git a/src/zm_jpeg.cpp b/src/zm_jpeg.cpp
@@ -456,10 +456,10 @@ void zm_use_std_huff_tables( j_decompress_ptr cinfo ) {
 	  0
 	};
 
-	cinfo->dc_huff_tbl_ptrs[0] = &dclumin;
-	cinfo->dc_huff_tbl_ptrs[1] = &dcchrome;
-	cinfo->ac_huff_tbl_ptrs[0] = &aclumin;
-	cinfo->ac_huff_tbl_ptrs[1] = &acchrome;
+	cinfo->dc_huff_tbl_ptrs[0] = (JHUFF_TBL*)&dclumin;
+	cinfo->dc_huff_tbl_ptrs[1] = (JHUFF_TBL*)&dcchrome;
+	cinfo->ac_huff_tbl_ptrs[0] = (JHUFF_TBL*)&aclumin;
+	cinfo->ac_huff_tbl_ptrs[1] = (JHUFF_TBL*)&acchrome;
 
 }
 

diff --git a/src/zm_remote_camera_rtsp.cpp b/src/zm_remote_camera_rtsp.cpp
@@ -259,27 +259,6 @@ int RemoteCameraRtsp::Capture( Image &image )
 
             av_init_packet( &packet );
 
-<<<<<<< HEAD
-            while ( !frameComplete )
-            {
-                packet.data = buffer.head();
-                packet.size = buffer.size();
-                int len = avcodec_decode_video2( mCodecContext, mRawFrame, &frameComplete, &packet );
-                if ( len < 0 )
-                {
-                    Error( "Error while decoding frame %d", frameCount );
-                    Hexdump( Logger::ERROR, buffer.head(), buffer.size()>256?256:buffer.size() );
-                    buffer.clear();
-                    continue;
-                }
-                Debug( 2, "Frame: %d - %d/%d", frameCount, len, buffer.size() );
-                //if ( buffer.size() < 400 )
-                    //Hexdump( 0, buffer.head(), buffer.size() );
-
-                if ( frameComplete )
-                {
-			Debug( 3, "Got frame %d", frameCount );
-=======
 	    while ( !frameComplete && buffer.size() > 0 )
 	    {
 		packet.data = buffer.head();
@@ -288,7 +267,7 @@ int RemoteCameraRtsp::Capture( Image &image )
 		if ( len < 0 )
 		{
 			Error( "Error while decoding frame %d", frameCount );
-			Hexdump( ZM_DBG_ERR, buffer.head(), buffer.size()>256?256:buffer.size() );
+			Hexdump( Logger::ERROR, buffer.head(), buffer.size()>256?256:buffer.size() );
 			buffer.clear();
 			continue;
 		}
@@ -302,7 +281,6 @@ int RemoteCameraRtsp::Capture( Image &image )
             if ( frameComplete ) {
 
 		Debug( 3, "Got frame %d", frameCount );
->>>>>>> Some small changes
 
 		avpicture_fill( (AVPicture *)mFrame, directbuffer, imagePixFormat, width, height);