Codecs merging with master branch

diff --cc src/codecs/Makefile.am
index 8a85b6d1486ac40c78c1debbcacd4696128439ab,226204aca94380f79af40bf841a42f5e634e04eb..529664c0c13845c025fd9e9a4df7b6763f9f5094
--- 1/src/codecs/Makefile.am
--- 2/src/codecs/Makefile.am
+++ b/src/codecs/Makefile.am
@@@ -11,8 -11,7 +11,8 @@@ sf_protocols.
  libcodecs_a_SOURCES = \
  codec_api.cc \
  codec_api.h \
- decode_module.h \
+ decode_module.h
 +sf_protocols.h
  
  libcodec_utils_a_SOURCES = \
  codec_events.cc \

diff --cc src/protocols/Makefile.am
Simple merge