From: Andre Noll <maan@systemlinux.org>
Date: Mon, 2 Mar 2009 09:39:59 +0000 (+0100)
Subject: Merge commit 'meins/master'
X-Git-Tag: v0.3.4~57
X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=commitdiff_plain;h=eea9d1cae30df921ae2fd1771518b8b21dbd0daf;hp=-c

Merge commit 'meins/master'
---

eea9d1cae30df921ae2fd1771518b8b21dbd0daf
diff --combined error.h
index 78d29792,c3ac3dca..24f2a113
--- a/error.h
+++ b/error.h
@@@ -31,13 -31,27 +31,27 @@@ DEFINE_ERRLIST_OBJECT_ENUM
  #define GGO_ERRORS
  #define COLOR_ERRORS
  
- 
  extern const char **para_errlist[];
  
  #define COMPRESS_FILTER_ERRORS \
  	PARA_ERROR(COMPRESS_SYNTAX, "syntax error in compress filter config"), \
  
  
+ #define FEC_ERRORS \
+ 	PARA_ERROR(FEC_BAD_IDX, "invalid index vector"), \
+ 	PARA_ERROR(FEC_SINGULAR, "unexpected singular matrix"), \
+ 	PARA_ERROR(FEC_PIVOT, "pivot column not found"), \
+ 	PARA_ERROR(FEC_PARMS, "invalid fec parameters"), \
+ 
+ 
+ #define FECDEC_FILTER_ERRORS \
+ 	PARA_ERROR(BAD_FEC_HEADER, "invalid fec header"), \
+ 	PARA_ERROR(BAD_SLICE_SIZE, "slice size too large"), \
+ 	PARA_ERROR(BAD_SLICE_NUM, "invalid slice number"), \
+ 	PARA_ERROR(FECDEC_OVERRUN, "fecdec output buffer overrun"), \
+ 	PARA_ERROR(FECDEC_EOF, "received eof packet"), \
+ 
+ 
  #define AMP_FILTER_ERRORS \
  	PARA_ERROR(AMP_SYNTAX, "syntax error in amp filter config"), \
  
@@@ -375,6 -389,7 +389,6 @@@
  	PARA_ERROR(SAMPLE_FORMAT, "sample format not available"), \
  	PARA_ERROR(CHANNEL_COUNT, "channels count not available"), \
  	PARA_ERROR(HW_PARAMS, "unable to install hw params"), \
 -	PARA_ERROR(SW_PARAMS, "unable to install sw params"), \
  	PARA_ERROR(BAD_PERIOD, "can not use period equal to buffer size"), \
  	PARA_ERROR(ALSA_WRITE, "alsa write error"), \
  	PARA_ERROR(PCM_OPEN, "unable to open pcm"), \