[vlc-commits] Revert "contrib: live555: use armlinux config when building for arm"

[Jean-Baptiste Kempf]

vlc/vlc-1.2 | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Fri Jan 20 10:46:46 2012 +0100| [0c427a274c9ad8e0c72b50be158a5353d13d1ecb] | committer: Jean-Baptiste Kempf

Revert "contrib: live555: use armlinux config when building for arm"

This reverts commit 4135148ba02495d59c01e190843bf2cc647c7ef1.

It would seem that we need to discuss more about this, before.
Back to the ml.
(cherry picked from commit 21116876182133ab62ce0044a5ee5b176b6b477c)

Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>

> http://git.videolan.org/gitweb.cgi/vlc/vlc-1.2.git/?a=commit;h=0c427a274c9ad8e0c72b50be158a5353d13d1ecb
---

 contrib/src/live555/rules.mak |    4 ----
 1 files changed, 0 insertions(+), 4 deletions(-)

diff --git a/contrib/src/live555/rules.mak b/contrib/src/live555/rules.mak
index 4f870a4..d90c9b7 100644
--- a/contrib/src/live555/rules.mak
+++ b/contrib/src/live555/rules.mak
@@ -23,12 +23,8 @@ endif
 
 LIVE_TARGET = $(error live555 target not defined!)
 ifdef HAVE_LINUX
-ifeq ($(ARCH),arm)
-LIVE_TARGET := armlinux
-else
 LIVE_TARGET := linux
 endif
-endif
 ifdef HAVE_WIN32
 LIVE_TARGET := mingw
 endif