Merge commit '20271c6df57dacbaed3f2255a8230f44f58bd3ae'

Apparently when 1.6.0 was release it was not properly merged. This re-add the disable p25 encryption muting flag.

Conflicts:
	README
	dsd.h
	dsd_main.c
	dsd_symbol.c
	p25p1_ldu1.c
	p25p1_ldu2.c
This commit is contained in:
Jared Szechy
2013-12-19 09:57:23 -05:00
5 changed files with 46 additions and 37 deletions

1
dsd.h
View File

@@ -100,6 +100,7 @@ typedef struct
int playfiles;
int delay;
int use_cosine_filter;
int unmute_encrypted_p25;
} dsd_opts;
typedef struct