[packages/zoneminder] - more ffmpeg2 fixes

baggins baggins at pld-linux.org
Thu Aug 29 18:12:03 CEST 2013


commit f4c9b69d93ac3aa54a362b97bbbf9c19e1ab0d3c
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Thu Aug 29 18:11:54 2013 +0200

    - more ffmpeg2 fixes

 ffmpeg-2.0.patch | 11 +++++++++++
 1 file changed, 11 insertions(+)
---
diff --git a/ffmpeg-2.0.patch b/ffmpeg-2.0.patch
index aabd112..e43e078 100644
--- a/ffmpeg-2.0.patch
+++ b/ffmpeg-2.0.patch
@@ -51,3 +51,14 @@
          //int clockRate;
          //int autoChannels;
      };
+--- ZoneMinder-1.25.0/src/zm_ffmpeg_camera.cpp~	2013-08-29 18:09:12.227817417 +0200
++++ ZoneMinder-1.25.0/src/zm_ffmpeg_camera.cpp	2013-08-29 18:11:09.392520063 +0200
+@@ -122,7 +122,7 @@
+         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
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/zoneminder.git/commitdiff/f4c9b69d93ac3aa54a362b97bbbf9c19e1ab0d3c



More information about the pld-cvs-commit mailing list