From: Roman Bazalevsky Date: Tue, 2 Sep 2014 10:05:52 +0000 (+0400) Subject: Minor fixes X-Git-Url: https://git.rvb.name/oss-streamer.git/commitdiff_plain/HEAD?hp=46061842ccbe8b1c195932288a36375654c861c1 Minor fixes --- diff --git a/build.sh b/build.sh new file mode 100755 index 0000000..2df5077 --- /dev/null +++ b/build.sh @@ -0,0 +1,22 @@ +#!/bin/bash +export STAGING_DIR=/home/rvb/git/openwrt/staging_dir/toolchain-mips_34kc_gcc-4.8-linaro_uClibc-0.9.33.2/ +/home/rvb/git/openwrt/staging_dir/toolchain-mips_34kc_gcc-4.8-linaro_uClibc-0.9.33.2/bin/mips-openwrt-linux-uclibc-gcc \ + -Os -pipe -mno-branch-likely -mips32r2 -mtune=34kc \ + -fno-caller-saves -fhonour-copts -Wno-error=unused-but-set-variable -msoft-float \ + -mips16 -minterlink-mips16 \ + -I/home/rvb/git/openwrt/staging_dir/target-mips_34kc_uClibc-0.9.33.2/usr/include \ + -I/home/rvb/git/openwrt/staging_dir/target-mips_34kc_uClibc-0.9.33.2/include \ + -I/home/rvb/git/openwrt/staging_dir/toolchain-mips_34kc_gcc-4.8-linaro_uClibc-0.9.33.2/usr/include \ + -I/home/rvb/git/openwrt/staging_dir/toolchain-mips_34kc_gcc-4.8-linaro_uClibc-0.9.33.2/include \ + -L/home/rvb/git/openwrt/staging_dir/target-mips_34kc_uClibc-0.9.33.2/usr/lib \ + -L/home/rvb/git/openwrt/staging_dir/target-mips_34kc_uClibc-0.9.33.2/lib \ + -L/home/rvb/git/openwrt/staging_dir/toolchain-mips_34kc_gcc-4.8-linaro_uClibc-0.9.33.2/usr/lib \ + -L/home/rvb/git/openwrt/staging_dir/toolchain-mips_34kc_gcc-4.8-linaro_uClibc-0.9.33.2/lib \ + -I/home/rvb/git/openwrt/staging_dir/target-mips_34kc_uClibc-0.9.33.2/usr/include \ + -I/home/rvb/git/openwrt/staging_dir/target-mips_34kc_uClibc-0.9.33.2/include \ + -I/home/rvb/git/openwrt/staging_dir/toolchain-mips_34kc_gcc-4.8-linaro_uClibc-0.9.33.2/usr/include \ + -I/home/rvb/git/openwrt/staging_dir/toolchain-mips_34kc_gcc-4.8-linaro_uClibc-0.9.33.2/include \ + -D'SVN_REV="Unversioned directory"' -O2 -DLINUX -D_GNU_SOURCE -Wall \ + oss-streamer.c -lpthread -ldl -o oss-streamer + + \ No newline at end of file diff --git a/oss-streamer b/oss-streamer index ceabc2e..7fdd265 100755 Binary files a/oss-streamer and b/oss-streamer differ diff --git a/oss-streamer.c b/oss-streamer.c index a64a166..411c133 100644 --- a/oss-streamer.c +++ b/oss-streamer.c @@ -121,7 +121,7 @@ void help(char *progname) fprintf(stderr, "------------------------------------------------------------------\n"); fprintf(stderr, "Usage: oss-stream" \ " [-h | --help ]........: display this help\n" \ - " [-d | --device ]......: video device to open (your camera)\n" \ + " [-d | --device ]......: audio device to open (your camera)\n" \ " [-p | --port ]........: TCP-port for the server\n" \ " [-v | --version ].....: display version information\n" \ " [-b | --background]...: fork to the background, daemon mode\n"); @@ -279,7 +279,7 @@ int main(int argc, char *argv[]) /* allocate audio datastructure */ - /* open video device and prepare data structure */ + /* open audio device and prepare data structure */ if (strcmp(dev,"stdin")==0) { source_dev = stdin; } else {