From 71897acdcdefca95bbce22ffc6802c2c5eab48ba Mon Sep 17 00:00:00 2001 From: Nicolas Chauvet Date: Thu, 6 Nov 2014 10:49:06 +0000 Subject: [PATCH] Fix for flv --- vlc-2.1.5-ffmpeg-2.4-bug.patch | 11 +++++++++++ vlc.spec | 7 ++++++- 2 files changed, 17 insertions(+), 1 deletion(-) create mode 100644 vlc-2.1.5-ffmpeg-2.4-bug.patch diff --git a/vlc-2.1.5-ffmpeg-2.4-bug.patch b/vlc-2.1.5-ffmpeg-2.4-bug.patch new file mode 100644 index 0000000..bcb5324 --- /dev/null +++ b/vlc-2.1.5-ffmpeg-2.4-bug.patch @@ -0,0 +1,11 @@ +--- a/modules/demux/avformat/demux.c 2013-12-03 10:12:34.000000000 +0100 ++++ b/modules/demux/avformat/demux.c 2014-10-12 22:07:54.044769366 +0200 +@@ -106,7 +106,7 @@ int OpenDemux( vlc_object_t *p_this ) + { + demux_t *p_demux = (demux_t*)p_this; + demux_sys_t *p_sys; +- AVProbeData pd; ++ AVProbeData pd = {0}; + AVInputFormat *fmt = NULL; + unsigned int i; + int64_t i_start_time = -1; diff --git a/vlc.spec b/vlc.spec index 445542d..e2b908b 100644 --- a/vlc.spec +++ b/vlc.spec @@ -33,13 +33,14 @@ Summary: The cross-platform open-source multimedia framework, player and server Name: vlc Version: 2.1.5 -Release: 6%{?dist} +Release: 7%{?dist} License: GPLv2+ Group: Applications/Multimedia URL: http://www.videolan.org Source0: http://download.videolan.org/pub/videolan/vlc/%{version}/vlc-%{version}%{?vlc_rc}.tar.xz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Patch0: vlc-2.1.5-ffmpeg-2.4.patch +Patch1: vlc-2.1.5-ffmpeg-2.4-bug.patch BuildRequires: desktop-file-utils @@ -224,6 +225,7 @@ JACK audio plugin for the VLC media player. %prep %setup -q -n %{name}-%{version}%{?vlc_rc} %patch0 -p1 -b .ffmpeg24 +%patch1 -p1 -b .ffmpeg24bug %{?_with_bootstrap: rm aclocal.m4 m4/lib*.m4 m4/lt*.m4 || : @@ -493,6 +495,9 @@ fi || : %changelog +* Thu Nov 06 2014 Nicolas Chauvet - 2.1.5-7 +- Fix for flv - rfbz#3401 + * Wed Nov 05 2014 Nicolas Chauvet - 2.1.5-6 - Rebuilt for vaapi 0.36