From f89037a7471edd92e5f4ab8068920bb51c7abe45 Mon Sep 17 00:00:00 2001
From: Márcio Alexandre Silva Delgado <coadde@adinet.com.uy>
Date: Tue, 25 Sep 2012 13:18:26 -0300
Subject: zoneminder: updating package

---
 pcr/zoneminder/patch-ffmpeg-0.11.patch | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'pcr/zoneminder/patch-ffmpeg-0.11.patch')

diff --git a/pcr/zoneminder/patch-ffmpeg-0.11.patch b/pcr/zoneminder/patch-ffmpeg-0.11.patch
index 8356fff83..ac56e4c69 100644
--- a/pcr/zoneminder/patch-ffmpeg-0.11.patch
+++ b/pcr/zoneminder/patch-ffmpeg-0.11.patch
@@ -2,7 +2,7 @@ diff --git a/src/zm_ffmpeg_camera.cpp b/src/zm_ffmpeg_camera.cpp
 index 42927f6..61df606 100644
 --- a/src/zm_ffmpeg_camera.cpp
 +++ b/src/zm_ffmpeg_camera.cpp
-@@ -108,7 +108,7 @@ int FfmpegCamera::PrimeCapture()
+@@ -91,7 +91,7 @@ int FfmpegCamera::PrimeCapture()
      Info( "Priming capture from %s", mPath.c_str() );
  
      // Open the input, not necessarily a file
@@ -11,7 +11,7 @@ index 42927f6..61df606 100644
          Fatal( "Unable to open input %s due to: %s", mPath.c_str(), strerror(errno) );
  
      // Locate stream info from input
-@@ -139,7 +139,7 @@ int FfmpegCamera::PrimeCapture()
+@@ -122,7 +122,7 @@ int FfmpegCamera::PrimeCapture()
          Fatal( "Can't find codec for video stream from %s", mPath.c_str() );
  
      // Open the codec
@@ -25,7 +25,7 @@ diff --git a/src/zm_mpeg.cpp b/src/zm_mpeg.cpp
 index f5de2a4..d614346 100644
 --- a/src/zm_mpeg.cpp
 +++ b/src/zm_mpeg.cpp
-@@ -167,10 +167,12 @@ void VideoStream::SetParameters()
+@@ -130,10 +130,12 @@ void VideoStream::SetParameters()
  {
  	/* set the output parameters (must be done even if no
  	   parameters). */
@@ -40,7 +40,7 @@ index f5de2a4..d614346 100644
  	//dump_format(ofc, 0, filename, 1);
  }
  
-@@ -259,7 +261,7 @@ void VideoStream::OpenStream()
+@@ -222,7 +224,7 @@ void VideoStream::OpenStream()
  	if ( !(of->flags & AVFMT_NOFILE) )
  	{
  #if LIBAVUTIL_VERSION_INT >= AV_VERSION_INT(51,2,1)
@@ -49,7 +49,7 @@ index f5de2a4..d614346 100644
  #else
  		if ( url_fopen(&ofc->pb, filename, URL_WRONLY) < 0 )
  #endif
-@@ -278,7 +280,7 @@ void VideoStream::OpenStream()
+@@ -241,7 +243,7 @@ void VideoStream::OpenStream()
  	}
  
  	/* write the stream header, if any */
@@ -57,4 +57,4 @@ index f5de2a4..d614346 100644
 +	avformat_write_header(ofc, NULL);
  }
  
- VideoStream::VideoStream( const char *filename, const char *format, int bitrate, double frame_rate, int colours, int subpixelorder, int width, int height )
\ No newline at end of file
+ VideoStream::VideoStream( const char *filename, const char *format, int bitrate, double frame_rate, int colours, int subpixelorder, int width, int height )
-- 
cgit v1.2.3-54-g00ecf