Update to 20181111

el8
Leigh Scott 6 years ago
parent 4316568810
commit bdc25f6874

@ -1 +1 @@
1cb3b2a64ca6413de954c0eb38697ebe vlc-3.0.5-20181020-0221.tar.xz
5a3d4db577d07bf2d6486f7e7af1b05e vlc-3.0.5-20181111-0221.tar.xz

@ -1,4 +1,4 @@
%global vlc_date 20181020
%global vlc_date 20181111
#global vlc_rc -rc9
%global vlc_tag -%{?vlc_date}-0221
%if 0%{?vlc_tag:1}
@ -43,11 +43,10 @@
Summary: The cross-platform open-source multimedia framework, player and server
Name: vlc
Version: 3.0.5
Release: 4%{?dist}
Release: 5%{?dist}
License: GPLv2+
URL: https://www.videolan.org
Source0: %{vlc_url}/%{?!vlc_tag:%{version}/}vlc-%{version}%{?vlc_tag}.tar.xz
Patch1: x264-Fix-build-with-a-newer-version-of-x264.patch
BuildRequires: desktop-file-utils
BuildRequires: libappstream-glib
@ -580,6 +579,9 @@ fi || :
%changelog
* Sun Nov 11 2018 Leigh Scott <leigh123linux@googlemail.com> - 3.0.5-5
- Update to 20181111
* Sat Oct 20 2018 Nicolas Chauvet <kwizart@gmail.com> - 3.0.5-4
- Update to 20181020

@ -1,13 +0,0 @@
diff --git a/modules/codec/x264.c b/modules/codec/x264.c
index e02048f075..dec95a9c78 100644
--- a/modules/codec/x264.c
+++ b/modules/codec/x264.c
@@ -842,7 +842,7 @@ static int Open ( vlc_object_t *p_this )
fullrange |= p_enc->fmt_in.video.b_color_range_full;
p_enc->fmt_in.i_codec = fullrange ? VLC_CODEC_J420 : VLC_CODEC_I420;
p_sys->i_colorspace = X264_CSP_I420;
-#if X264_BUILD >= 118
+#if X264_BUILD >= 118 && X264_BUILD < 153
char *psz_profile = var_GetString( p_enc, SOUT_CFG_PREFIX "profile" );
if( psz_profile )
{
Loading…
Cancel
Save