summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJaromil <jaromil@dyne.org>2011-03-04 20:46:34 (GMT)
committer Jaromil <jaromil@dyne.org>2011-03-04 20:46:34 (GMT)
commitf24d6d8e7501ce92b3393e7ec6036a7a67a11cc6 (patch)
tree3eab6e172a3a803f15955870426da1786224238b
parent048a1c4c31f1aeb294636b18950d450ef74f5822 (diff)
fix to process aalib options on commandline
-rw-r--r--README4
-rw-r--r--configure.ac2
-rw-r--r--src/hasciicam.c6
3 files changed, 6 insertions, 6 deletions
diff --git a/README b/README
index f72cea0..c88366a 100644
--- a/README
+++ b/README
@@ -8,7 +8,7 @@
[ (h)ascii for the masses! ]
- version 1.1
+ version 1.1.1
Hasciicam makes it possible to have live ascii video on the web. It
captures video from a tv card and renders it into ascii, formatting
@@ -105,7 +105,7 @@ man hasciicam
CREDITS
- Hasciicam software is written by Jaromil - http://rastasoft.org
+ Hasciicam is written by Jaromil - http://rastasoft.org
code, hacks and ideas have been contributed by:
jan hubicka and the aalibcrew, gerdknorr, mathop, augustonero, boffh,
diff --git a/configure.ac b/configure.ac
index 1e4c28f..f971527 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4,7 +4,7 @@ dnl ==============================================================
AC_PREREQ([2.60])
-AC_INIT([hasciicam],[1.1.0],[jaromil@dyne.org],[hasciicam])
+AC_INIT([hasciicam],[1.1.1],[jaromil@dyne.org],[hasciicam])
AC_CONFIG_MACRO_DIR([m4])
AC_CANONICAL_HOST
diff --git a/src/hasciicam.c b/src/hasciicam.c
index e9c5452..28df6e3 100644
--- a/src/hasciicam.c
+++ b/src/hasciicam.c
@@ -653,11 +653,11 @@ main (int argc, char **argv) {
memcpy (&ascii_hwparms, &aa_defparams, sizeof (struct aa_hardware_params));
ascii_rndparms = aa_getrenderparams();
- // memcpy (&ascii_rndparms,&aa_defrenderparams,sizeof(struct aa_renderparams));
- /* set hasciicam options */
- config_init (argc, argv);
/* gathering aalib commandline options */
aa_parseoptions (&ascii_hwparms, ascii_rndparms, &argc, argv);
+
+ /* set hasciicam options */
+ config_init (argc, argv);
/* detect and init video device */
if( vid_detect(device) > 0 ) {
vid_init();