From 1187d7cb38d2700e4773d79b1a3d26fd46adf0df Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Fabian=20Silva=20Delgado?=
 <emulatorman@lavabit.com>
Date: Tue, 11 Sep 2012 03:36:56 -0300
Subject: zoneminder: adding new package to [pcr] repo

---
 pcr/zoneminder/patch-ffmpeg-0.11.patch | 60 ++++++++++++++++++++++++++++++++++
 1 file changed, 60 insertions(+)
 create mode 100644 pcr/zoneminder/patch-ffmpeg-0.11.patch

(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
new file mode 100644
index 000000000..8356fff83
--- /dev/null
+++ b/pcr/zoneminder/patch-ffmpeg-0.11.patch
@@ -0,0 +1,60 @@
+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()
+     Info( "Priming capture from %s", mPath.c_str() );
+ 
+     // Open the input, not necessarily a file
+-    if ( av_open_input_file( &mFormatContext, mPath.c_str(), NULL, 0, NULL ) !=0 )
++    if ( avformat_open_input( &mFormatContext, mPath.c_str(), NULL, NULL ) !=0 )
+         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()
+         Fatal( "Can't find codec for video stream from %s", mPath.c_str() );
+ 
+     // Open the codec
+-    if ( avcodec_open( mCodecContext, mCodec ) < 0 )
++    if ( avcodec_open2( mCodecContext, mCodec, NULL ) < 0 )
+         Fatal( "Unable to open codec for video stream from %s", mPath.c_str() );
+ 
+     // Allocate space for the native video frame
+
+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()
+ {
+ 	/* set the output parameters (must be done even if no
+ 	   parameters). */
+-	if ( av_set_parameters(ofc, NULL) < 0 )
++	/*
++     * Removed in last ffmpeg
++     * if ( av_set_parameters(ofc, NULL) < 0 )
+ 	{
+ 		Panic( "Invalid output format parameters" );
+-	}
++	}*/
+ 	//dump_format(ofc, 0, filename, 1);
+ }
+ 
+@@ -259,7 +261,7 @@ void VideoStream::OpenStream()
+ 	if ( !(of->flags & AVFMT_NOFILE) )
+ 	{
+ #if LIBAVUTIL_VERSION_INT >= AV_VERSION_INT(51,2,1)
+-		if ( avio_open(&ofc->pb, filename, URL_WRONLY) < 0 )
++		if ( avio_open(&ofc->pb, filename, AVIO_FLAG_WRITE) < 0 )
+ #else
+ 		if ( url_fopen(&ofc->pb, filename, URL_WRONLY) < 0 )
+ #endif
+@@ -278,7 +280,7 @@ void VideoStream::OpenStream()
+ 	}
+ 
+ 	/* write the stream header, if any */
+-	av_write_header(ofc);
++	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
-- 
cgit v1.2.3-2-g168b