From c6ac8929c4ad75e38f8c1f18dd69812b1a25437c9554d92e00df9f02bfb3c0a5 Mon Sep 17 00:00:00 2001
From: Dominique Leuenberger <dimstar@opensuse.org>
Date: Mon, 8 Aug 2016 09:16:33 +0000
Subject: [PATCH] Accepting request 417435 from multimedia:libs

Revert for now

OBS-URL: https://build.opensuse.org/request/show/417435
OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/vlc?expand=0&rev=178
---
 vlc.changes |  5 -----
 vlc.spec    | 19 +++++--------------
 2 files changed, 5 insertions(+), 19 deletions(-)

diff --git a/vlc.changes b/vlc.changes
index d99cc6f..2ad56c9 100644
--- a/vlc.changes
+++ b/vlc.changes
@@ -1,8 +1,3 @@
--------------------------------------------------------------------
-Mon Aug  8 08:22:56 UTC 2016 - dimstar@opensuse.org
-
-- Enable avcodec module for openSUSE Tumbleweed.
-
 -------------------------------------------------------------------
 Thu Aug  4 18:59:44 UTC 2016 - dimstar@opensuse.org
 
diff --git a/vlc.spec b/vlc.spec
index 4e4577e..5f06f19 100644
--- a/vlc.spec
+++ b/vlc.spec
@@ -374,6 +374,9 @@ export LDFLAGS="-pie"
    --disable-dependency-tracking        \
    --enable-aa                          \
    --enable-alsa                        \
+%if ! 0%{?BUILD_ORIG}
+   --disable-avcodec                    \
+%endif
    --enable-dvbpsi                      \
 %if 0%{?suse_version} > 1110 || 0%{?BUILD_ORIG}
    --enable-dvdnav                      \
@@ -416,12 +419,10 @@ export LDFLAGS="-pie"
 %else
    --disable-swscale                    \
 %endif
-%if 0%{?suse_version} >= 1321 || 0%{?BUILD_ORIG}
-   --enable-avcodec                     \
-%endif
 %if 0%{?BUILD_ORIG}
    --enable-libmpeg2                    \
    --enable-mad                         \
+   --enable-avcodec                     \
    --enable-postproc                    \
    --enable-faad                        \
    --enable-a52                         \
@@ -429,6 +430,7 @@ export LDFLAGS="-pie"
 %else
    --disable-libmpeg2                   \
    --disable-mad                        \
+   --disable-avcodec                    \
    --disable-postproc                   \
    --disable-faad                       \
    --disable-a52                        \
@@ -1120,15 +1122,6 @@ install -Dm0644 %{S:3} %{buildroot}%{_datadir}/appdata/%{name}.appdata.xml
 %endif
 %{_libdir}/vlc/plugins/video_output/libyuv_plugin.so
 %{_libdir}/vlc/plugins/visualization/libvisual_plugin.so
-%if 0%{?suse_version} >= 1321
-%{_libdir}/vlc/plugins/codec/libavcodec_plugin.so
-%endif
-
-%if %{with gstreamer}
-%files codec-gstreamer
-%defattr(-,root,root)
-%{_libdir}/vlc/plugins/codec/libgstdecode_plugin.so
-%endif
 
 %if %{with gstreamer}
 %files codec-gstreamer
@@ -1143,9 +1136,7 @@ install -Dm0644 %{S:3} %{buildroot}%{_datadir}/appdata/%{name}.appdata.xml
 %{_libdir}/vlc/plugins/audio_filter/liba52tofloat32_plugin.so
 %{_libdir}/vlc/plugins/audio_filter/libdtstofloat32_plugin.so
 %{_libdir}/vlc/plugins/audio_filter/libmpgatofixed32_plugin.so
-%if 0%{?suse_version} < 1321
 %{_libdir}/vlc/plugins/codec/libavcodec_plugin.so
-%endif
 %{_libdir}/vlc/plugins/codec/libfaad_plugin.so
 %{_libdir}/vlc/plugins/codec/liblibmpeg2_plugin.so
 %{_libdir}/vlc/plugins/codec/libtwolame_plugin.so