From: Andre Noll <maan@systemlinux.org>
Date: Wed, 14 Mar 2007 17:48:21 +0000 (+0100)
Subject: Merge /home/maan/scm/paraslash_fml/paraslash into mmap
X-Git-Tag: v0.2.16~16
X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=commitdiff_plain;h=25e6054e929908d9e21a2dd39996117e93124da5;hp=-c

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

25e6054e929908d9e21a2dd39996117e93124da5
diff --combined error.h
index d8c92293,e1007fd3..732a5470
--- a/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"), \
  
  
  /**