ffmpeg: install ffmpeg from ffmpeg-tools, don't include in image

Kodi doesn't need the command line ffmpeg, so don't install it.

This means we can install the full-fat command line ffmpeg from
ffmpeg-tools, and we don't need to call it ffmpegx as there is no
longer any conflict.

packages/addons/service/emby/changelog.txt

@@ -1,3 +1,6 @@
+120
+- Use ffmpeg instead of ffmpegx
+
 119
 - Update to 3.4.1.6
 - Add script (emby-update) to update Emby

packages/addons/service/emby/package.mk

@@ -19,7 +19,7 @@
 PKG_NAME="emby"
 PKG_VERSION="3.4.1.6"
 PKG_SHA256="8eb129f538cefec612239932fd85ddc6bd5221cd97613e142f41f2126412ea04"
-PKG_REV="119"
+PKG_REV="120"
 PKG_ARCH="any"
 PKG_LICENSE="OSS"
 PKG_SITE="http://emby.media"

packages/addons/service/emby/source/bin/emby.start

@@ -25,7 +25,7 @@ mkdir -p $ADDON_HOME
 
 if [ "$emby_ffmpeg" != "false" ]
 then
-  emby_flags="-ffmpeg /storage/.kodi/addons/tools.ffmpeg-tools/bin/ffmpegx -ffprobe /storage/.kodi/addons/tools.ffmpeg-tools/bin/ffprobex"
+  emby_flags="-ffmpeg /storage/.kodi/addons/tools.ffmpeg-tools/bin/ffmpeg -ffprobe /storage/.kodi/addons/tools.ffmpeg-tools/bin/ffprobe"
 fi
 
 mono $ADDON_DIR/Emby.Mono/MediaBrowser.Server.Mono.exe -programdata $ADDON_HOME \

packages/multimedia/ffmpeg/package.mk

@@ -216,7 +216,8 @@ configure_target() {
               --disable-altivec \
               $PKG_FFMPEG_FPU \
               $PKG_FFMPEG_X86ASM \
-              --disable-symver
+              --disable-symver \
+              --disable-programs
 }
 
 post_makeinstall_target() {