From 4435cf41e3ad14a287dfb8580c7beb7f3721f2ba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=ADctor=20Manuel=20J=C3=A1quez=20Leal?= Date: Mon, 29 Oct 2018 11:27:18 +0100 Subject: [PATCH] fix README.md from previous merge --- README.md | 5 ----- 1 file changed, 5 deletions(-) diff --git a/README.md b/README.md index 9b27831ba..8a32d78b9 100644 --- a/README.md +++ b/README.md @@ -83,13 +83,8 @@ Homebrew only installs various plugins if explicitly enabled, so some extra ``` $ brew install gstreamer gst-plugins-base gst-plugins-good \ gst-plugins-bad gst-plugins-ugly gst-libav gst-rtsp-server \ -<<<<<<< HEAD --with-orc --with-libogg --with-opus --with-pango --with-theora \ --with-libvorbis --with-libvpx --enable-gtk3 -======= - --with-orc -with-libogg --with-opus --with-pango --with-theora \ - --with-libvorbis --with-libvpx ->>>>>>> Add libvpx to brew install ``` If you wish to install the gstreamer-player sub-crate, make sure the