diff --git a/bin/install_hyperion.sh b/bin/install_hyperion.sh index 5ec9a2a0..53dd28e6 100755 --- a/bin/install_hyperion.sh +++ b/bin/install_hyperion.sh @@ -36,7 +36,7 @@ if [ $IS_OPENELEC -eq 1 ]; then # OpenELEC has a readonly file system. Use alternative location curl --get https://raw.github.com/tvdzwan/hyperion/master/deploy/hyperion.tar.gz | tar -C /storage -xz curl --get https://raw.github.com/tvdzwan/hyperion/master/deploy/hyperion.deps.openelec-rpi.tar.gz | tar -C /storage/hyperion/bin -xz - + # modify the default config to have a correct effect path sed -i 's:/opt:/storage:g' /storage/hyperion/config/hyperion.config.json else @@ -47,6 +47,7 @@ fi if [ $IS_OPENELEC -ne 1 ]; then ln -fs /opt/hyperion/bin/hyperiond /usr/bin/hyperiond ln -fs /opt/hyperion/bin/hyperion-remote /usr/bin/hyperion-remote + ln -fs /opt/hyperion/bin/hyperion-v4l2 /usr/bin/hyperion-v4l2 fi # create link to the gpio changer (gpio->spi) @@ -62,7 +63,6 @@ if [ $IS_OPENELEC -eq 1 ]; then else ln -s /opt/hyperion/config/hyperion.config.json /etc/hyperion.config.json fi - # Copy the service control configuration to /etc/int if [ $USE_INITCTL -eq 1 ]; then diff --git a/deploy/hyperion.tar.gz.REMOVED.git-id b/deploy/hyperion.tar.gz.REMOVED.git-id index d163bc69..362f60df 100644 --- a/deploy/hyperion.tar.gz.REMOVED.git-id +++ b/deploy/hyperion.tar.gz.REMOVED.git-id @@ -1 +1 @@ -3ffb1a5d95dabb4c6a7b1ac40403ce5d393fe646 \ No newline at end of file +08d42deff1de4c4296e4c6e22c783a0096ed3396 \ No newline at end of file diff --git a/src/hyperion-v4l2/V4L2Grabber.cpp b/src/hyperion-v4l2/V4L2Grabber.cpp index a305ca9e..3c8f5a91 100644 --- a/src/hyperion-v4l2/V4L2Grabber.cpp +++ b/src/hyperion-v4l2/V4L2Grabber.cpp @@ -369,7 +369,6 @@ void V4L2Grabber::init_device(VideoStandard videoStandard, int input) } // check pixel format - switch (fmt.fmt.pix.pixelformat) { case V4L2_PIX_FMT_UYVY: