[SCM] lives/master: Fix catastrophic crash in 2.2.2.

[alessio at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit b96a8d80845f25d61b2f7b3a90377d994ea0a536
Author: Alessio Treglia <alessio at debian.org>
Date:   Mon Mar 10 17:09:50 2014 +0000

    Fix catastrophic crash in 2.2.2.
    
    Closes: #741132

diff --git a/debian/patches/99-workaround_av_find_stream_info.patch b/debian/patches/99-workaround_av_find_stream_info.patch
new file mode 100644
index 0000000..6f233e4
--- /dev/null
+++ b/debian/patches/99-workaround_av_find_stream_info.patch
@@ -0,0 +1,21 @@
+Description: Workaround to prevent lives 2.2.2 suddenly crash.
+Origin: upstream, salsaman at gmail.com
+Reviewed-by: Alessio Treglia <alessio at debian.org>
+---
+ lives-plugins/plugins/decoders/avformat_decoder.c |    2 ++
+ 1 file changed, 2 insertions(+)
+
+--- lives.orig/lives-plugins/plugins/decoders/avformat_decoder.c
++++ lives/lives-plugins/plugins/decoders/avformat_decoder.c
+@@ -43,9 +43,11 @@ static pthread_mutex_t avcodec_mutex=PTH
+ #define avcodec_open2(a, b, c) avcodec_open(a, b)
+ #endif
+ 
++/*
+ #if !HAVE_AVFORMAT_FIND_STREAM_INFO
+ #define avformat_find_stream_info(a, b) av_find_stream_info(a)
+ #endif
++*/
+ 
+ #define FAST_SEEK_LIMIT 50000 // microseconds (default 0.1 sec)
+ #define NO_SEEK_LIMIT 1000000 // microseconds
diff --git a/debian/patches/series b/debian/patches/series
index 28e26b8..8e7a27f 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 01-cdda2wav_to_icedax.patch
 02-drop_py3_multiencoder.patch
+99-workaround_av_find_stream_info.patch

-- 
lives packaging