fix README.md from previous merge

This commit is contained in:
Víctor Manuel Jáquez Leal 2018-10-29 11:27:18 +01:00 committed by Sebastian Dröge
parent f4685c4629
commit 4435cf41e3

View file

@ -83,13 +83,8 @@ Homebrew only installs various plugins if explicitly enabled, so some extra
``` ```
$ brew install gstreamer gst-plugins-base gst-plugins-good \ $ brew install gstreamer gst-plugins-base gst-plugins-good \
gst-plugins-bad gst-plugins-ugly gst-libav gst-rtsp-server \ gst-plugins-bad gst-plugins-ugly gst-libav gst-rtsp-server \
<<<<<<< HEAD
--with-orc --with-libogg --with-opus --with-pango --with-theora \ --with-orc --with-libogg --with-opus --with-pango --with-theora \
--with-libvorbis --with-libvpx --enable-gtk3 --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 If you wish to install the gstreamer-player sub-crate, make sure the