[shotdetect] 03/11: Fixed segmentation fault in 1002-fix-FTBFS-libav0.9.patch.

[Giulio Paci]

This is an automated email from the git hooks/post-receive script.

giuliopaci-guest pushed a commit to branch master
in repository shotdetect.

commit 129e6963b8f813b5053a2ce18ea86ee3421c910a
Author: Giulio Paci <giuliopaci at gmail.com>
Date:   Mon Aug 12 01:13:14 2013 +0200

    Fixed segmentation fault in 1002-fix-FTBFS-libav0.9.patch.
---
 debian/patches/1002-fix-FTBFS-libav0.9.patch |   11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/debian/patches/1002-fix-FTBFS-libav0.9.patch b/debian/patches/1002-fix-FTBFS-libav0.9.patch
index 3dc3361..267f913 100644
--- a/debian/patches/1002-fix-FTBFS-libav0.9.patch
+++ b/debian/patches/1002-fix-FTBFS-libav0.9.patch
@@ -2,16 +2,17 @@ Description: Fix FTBFS with libav 0.9 by replacing deprecated functions
 Author: Fabrice Coutadeur <fabricesp at ubuntu.com>
 --- a/src/film.cpp
 +++ b/src/film.cpp
-@@ -212,7 +212,7 @@
+@@ -212,7 +212,8 @@
     */
    av_register_all ();
  
 -  if (av_open_input_file (&pFormatCtx, input_path.c_str (), NULL, 0, NULL) != 0)
-+  if (avformat_open_input (&pFormatCtx, input_path.c_str (), NULL, NULL) != 0)
++  if( ! ( pFormatCtx = avformat_alloc_context() )
++      || (avformat_open_input (&pFormatCtx, input_path.c_str (), NULL, NULL) != 0) )
      {
        string error_msg = "Impossible to open file";
        error_msg += input_path;
-@@ -223,7 +223,7 @@
+@@ -223,7 +224,7 @@
    /*
     * Retrieve stream information 
     */
@@ -20,7 +21,7 @@ Author: Fabrice Coutadeur <fabricesp at ubuntu.com>
      return -1;			// Couldn't find stream information
  
  
-@@ -270,7 +270,7 @@
+@@ -270,7 +271,7 @@
  
        if (pCodecAudio == NULL)
  	return -1;		// Codec not found
@@ -29,7 +30,7 @@ Author: Fabrice Coutadeur <fabricesp at ubuntu.com>
  	return -1;		// Could not open codec
  
      }
-@@ -285,7 +285,7 @@
+@@ -285,7 +286,7 @@
  
        if (pCodec == NULL)
  	return -1;		// Codec not found

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-multimedia/shotdetect.git