rpms/vlc/F-17 vlc-backport-audio_decoder.patch, NONE, 1.1 vlc.spec, 1.160, 1.161

[Nicolas Chauvet]

Author: kwizart

Update of /cvs/free/rpms/vlc/F-17
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv29313/F-17

Modified Files:
	vlc.spec 
Added Files:
	vlc-backport-audio_decoder.patch 
Log Message:
Backport patch from 2.0.8a


vlc-backport-audio_decoder.patch:
 audio.c |    2 --
 1 file changed, 2 deletions(-)

--- NEW FILE vlc-backport-audio_decoder.patch ---
>From 68cf50be986313f7bb8e547dee3a547bc39926b7 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Rafa=C3=ABl=20Carr=C3=A9?= <funman at videolan.org>
Date: Tue, 30 Jul 2013 23:40:12 +0200
Subject: [PATCH] avcodec audio decoder: update block pointer

fixes ed616a22067
---
 modules/codec/avcodec/audio.c |    1 -
 1 file changed, 1 deletion(-)

diff --git a/modules/codec/avcodec/audio.c b/modules/codec/avcodec/audio.c
index 27b307c..a60b45f 100644
--- a/modules/codec/avcodec/audio.c
+++ b/modules/codec/avcodec/audio.c
@@ -264,7 +264,6 @@ aout_buffer_t * DecodeAudio ( decoder_t *p_dec, block_t **pp_block )
     if( !pp_block || !*pp_block ) return NULL;
 
     block_t *p_block = *pp_block;
-    pp_block = NULL;
 
     if( !p_sys->p_context->extradata_size && p_dec->fmt_in.i_extra &&
         p_sys->b_delayed_open)
-- 
1.7.10.4


Index: vlc.spec
===================================================================
RCS file: /cvs/free/rpms/vlc/F-17/vlc.spec,v
retrieving revision 1.160
retrieving revision 1.161
diff -u -r1.160 -r1.161
--- vlc.spec	30 Jul 2013 18:30:44 -0000	1.160
+++ vlc.spec	2 Aug 2013 10:14:51 -0000	1.161
@@ -31,13 +31,14 @@
 Summary:	The cross-platform open-source multimedia framework, player and server
 Name:		vlc
 Version:	2.0.8
-Release:	1%{?dist}
+Release:	2%{?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
 Patch0:         vlc-2.0.2-xcb_discard.patch
 Patch2:         0001-Switch-detection-of-smbclient-from-header-to-pkgconf.patch
+Patch3:         vlc-backport-audio_decoder.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	desktop-file-utils
@@ -231,6 +232,7 @@
 }
 %endif
 %patch2 -p1 -b .samba4
+%patch3 -p1 -b .backport
 
 %{?_with_bootstrap:
 rm aclocal.m4 m4/lib*.m4 m4/lt*.m4 || :
@@ -524,6 +526,9 @@
 
 
 %changelog
+* Fri Aug 02 2013 Nicolas Chauvet <kwizart at gmail.com> - 2.0.8-2
+- Backport patch from 2.0.8a
+
 * Tue Jul 30 2013 Nicolas Chauvet <kwizart at gmail.com> - 2.0.8-1
 - Update to 2.0.8
 - Enable upnp - rfbz#2833