Merge /home/maan/scm/paraslash_fml/paraslash into mmap

diff --combined error.h
index d8c92293e0d3c11b4d03b0e5596fdb95fc064941,e1007fd31f64a9f47b1aa33055dadadff5f589fc..732a5470c5c6f928131ec4721c6dbf90a5ddf3e2
--- 1/error.h
--- 2/error.h
+++ b/error.h
@@@ -274,8 -274,11 +274,8 @@@ extern const char **para_errlist[]
  
  
  #define AAC_AFH_ERRORS \
 -      PARA_ERROR(AAC_REPOS, "aac repositioning error"), \
 -      PARA_ERROR(AAC_READ, "aac read error"), \
        PARA_ERROR(STSZ, "did not find stcz atom"), \
        PARA_ERROR(MP4ASC, "audio spec config error"), \
 -      PARA_ERROR(AAC_OVERRUN, "aac output buffer overrun"), \
  
  
  #define AAC_COMMON_ERRORS \
@@@ -376,8 -379,6 +376,6 @@@
  
  #define DCCP_ERRORS \
        PARA_ERROR(DCCP_SOCKET, "can not create dccp socket"), \
-       PARA_ERROR(DCCP_PACKET_SIZE, "failed to set dccp packet size"), \
-       PARA_ERROR(DCCP_SERVICE, "could not get service code"), \
        PARA_ERROR(DCCP_RECV_EOF, "dccp_recv: end of file"), \
  
  
@@@ -444,7 -445,6 +442,7 @@@
  #define AACDEC_ERRORS \
        PARA_ERROR(AACDEC_INIT, "failed to init aac decoder"), \
        PARA_ERROR(AAC_DECODE, "aac decode error"), \
 +      PARA_ERROR(AAC_OVERRUN, "aac output buffer overrun"), \
  
  
  /**