[SCM] lives/master: debian/patches/99-workaround_av_find_stream_info.patch

[alessio at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 6fd09207f98a3bfa04f40e09eb189ccd7b9a5853
Author: Alessio Treglia <alessio at debian.org>
Date:   Tue Mar 11 14:27:04 2014 +0000

    debian/patches/99-workaround_av_find_stream_info.patch
    
    - Replace dirty workaround with proper patch cherry-picked from upstream's SVN.

diff --git a/debian/patches/99-workaround_av_find_stream_info.patch b/debian/patches/99-workaround_av_find_stream_info.patch
index 6f233e4..1797dc8 100644
--- a/debian/patches/99-workaround_av_find_stream_info.patch
+++ b/debian/patches/99-workaround_av_find_stream_info.patch
@@ -1,21 +1,20 @@
 Description: Workaround to prevent lives 2.2.2 suddenly crash.
-Origin: upstream, salsaman at gmail.com
+Origin: upstream, http://sourceforge.net/p/lives/code/2030/
 Reviewed-by: Alessio Treglia <alessio at debian.org>
 ---
- lives-plugins/plugins/decoders/avformat_decoder.c |    2 ++
- 1 file changed, 2 insertions(+)
+ lives-plugins/plugins/decoders/Makefile.am |    4 ++++
+ 1 file changed, 4 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
+--- lives.orig/lives-plugins/plugins/decoders/Makefile.am
++++ lives/lives-plugins/plugins/decoders/Makefile.am
+@@ -84,6 +84,10 @@ if HAVE_AVFORMAT_NEW_STREAM
+ libav_cflags += -DHAVE_AVFORMAT_NEW_STREAM=1
+ 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
++if HAVE_AVFORMAT_FIND_STREAM_INFO
++libav_cflags += -DHAVE_AVFORMAT_FIND_STREAM_INFO=1
++endif
++
+ if HAVE_AVPRIV_SET_PTS_INFO
+ libav_cflags += -DHAVE_AVPRIV_SET_PTS_INFO=1
+ endif

-- 
lives packaging