summaryrefslogtreecommitdiff
path: root/src/libxinevdec
diff options
context:
space:
mode:
Diffstat (limited to 'src/libxinevdec')
-rw-r--r--src/libxinevdec/cyuv.c4
-rw-r--r--src/libxinevdec/fli.c4
-rw-r--r--src/libxinevdec/idcinvideo.c8
-rw-r--r--src/libxinevdec/image.c23
-rw-r--r--src/libxinevdec/interplayvideo.c4
-rw-r--r--src/libxinevdec/msrle.c4
-rw-r--r--src/libxinevdec/qtrpza.c4
-rw-r--r--src/libxinevdec/qtsmc.c4
8 files changed, 28 insertions, 27 deletions
diff --git a/src/libxinevdec/cyuv.c b/src/libxinevdec/cyuv.c
index 570a94787..58d7e635c 100644
--- a/src/libxinevdec/cyuv.c
+++ b/src/libxinevdec/cyuv.c
@@ -18,7 +18,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
*
- * $Id: cyuv.c,v 1.17 2003/08/04 03:47:10 miguelfreitas Exp $
+ * $Id: cyuv.c,v 1.18 2003/08/25 21:51:43 f1rmb Exp $
*/
/* And this is the header that came with the CYUV decoder: */
@@ -87,7 +87,7 @@ typedef struct cyuv_decoder_s {
* height - the height of the output frame
* bit_per_pixel - ignored for now: may be used later for conversions.
*/
-void cyuv_decode(unsigned char *buf, int size, unsigned char *frame,
+static void cyuv_decode(unsigned char *buf, int size, unsigned char *frame,
int width, int height, int bit_per_pixel) {
int i, xpos, ypos, cur_Y = 0, cur_U = 0, cur_V = 0;
diff --git a/src/libxinevdec/fli.c b/src/libxinevdec/fli.c
index 5684aa93f..0e3a02921 100644
--- a/src/libxinevdec/fli.c
+++ b/src/libxinevdec/fli.c
@@ -23,7 +23,7 @@
* avoid when implementing a FLI decoder, visit:
* http://www.pcisys.net/~melanson/codecs/
*
- * $Id: fli.c,v 1.19 2003/08/04 03:47:10 miguelfreitas Exp $
+ * $Id: fli.c,v 1.20 2003/08/25 21:51:43 f1rmb Exp $
*/
#include <stdio.h>
@@ -86,7 +86,7 @@ typedef struct fli_decoder_s {
} fli_decoder_t;
-void decode_fli_frame(fli_decoder_t *this) {
+static void decode_fli_frame(fli_decoder_t *this) {
int stream_ptr = 0;
int stream_ptr_after_color_chunk;
int pixel_ptr;
diff --git a/src/libxinevdec/idcinvideo.c b/src/libxinevdec/idcinvideo.c
index 97dd8cb93..70d7ea818 100644
--- a/src/libxinevdec/idcinvideo.c
+++ b/src/libxinevdec/idcinvideo.c
@@ -21,7 +21,7 @@
* the Id CIN format, visit:
* http://www.csse.monash.edu.au/~timf/
*
- * $Id: idcinvideo.c,v 1.13 2003/08/04 03:47:10 miguelfreitas Exp $
+ * $Id: idcinvideo.c,v 1.14 2003/08/25 21:51:43 f1rmb Exp $
*/
#include <stdio.h>
@@ -92,7 +92,7 @@ static int num_huff_nodes[256];
/*
* Decodes input Huffman data using the Huffman table.
*/
-void huff_decode(idcinvideo_decoder_t *this) {
+static void huff_decode(idcinvideo_decoder_t *this) {
hnode_t *hnodes;
long i;
int prev;
@@ -135,7 +135,7 @@ void huff_decode(idcinvideo_decoder_t *this) {
* Returns the node index of the lowest unused node, or -1 if all nodes
* are used.
*/
-int huff_smallest_node(hnode_t *hnodes, int num_hnodes) {
+static int huff_smallest_node(hnode_t *hnodes, int num_hnodes) {
int i;
int best, best_node;
@@ -167,7 +167,7 @@ int huff_smallest_node(hnode_t *hnodes, int num_hnodes) {
* num_huff_nodes[prev] - contains the index to the root node of the tree.
* That is: huff_nodes[prev][num_huff_nodes[prev]] is the root node.
*/
-void huff_build_tree(int prev) {
+static void huff_build_tree(int prev) {
hnode_t *node, *hnodes;
int num_hnodes, i;
diff --git a/src/libxinevdec/image.c b/src/libxinevdec/image.c
index c67d09fa4..990219a52 100644
--- a/src/libxinevdec/image.c
+++ b/src/libxinevdec/image.c
@@ -17,7 +17,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
*
- * $Id: image.c,v 1.5 2003/08/04 03:47:10 miguelfreitas Exp $
+ * $Id: image.c,v 1.6 2003/08/25 21:51:43 f1rmb Exp $
*
* a image video decoder
*/
@@ -81,12 +81,12 @@ typedef struct image_decoder_s {
* png stuff
*/
-void info_callback(png_structp png_ptr, png_infop info);
-void row_callback(png_structp png_ptr, png_bytep new_row,
- png_uint_32 row_num, int pass);
-void end_callback(png_structp png_ptr, png_infop info);
+static void info_callback(png_structp png_ptr, png_infop info);
+static void row_callback(png_structp png_ptr, png_bytep new_row,
+ png_uint_32 row_num, int pass);
+static void end_callback(png_structp png_ptr, png_infop info);
-int initialize_png_reader(image_decoder_t *this) {
+static int initialize_png_reader(image_decoder_t *this) {
this->png_ptr = png_create_read_struct
(PNG_LIBPNG_VER_STRING, (png_voidp)this,
@@ -113,7 +113,7 @@ int initialize_png_reader(image_decoder_t *this) {
return 0;
}
-int finalize_png_reader(image_decoder_t *this) {
+static void finalize_png_reader(image_decoder_t *this) {
png_destroy_read_struct(&this->png_ptr, &this->info_ptr,
(png_infopp)NULL);
@@ -122,7 +122,8 @@ int finalize_png_reader(image_decoder_t *this) {
}
-int process_data(image_decoder_t *this, png_bytep buffer, png_uint_32 length) {
+static int process_data(image_decoder_t *this,
+ png_bytep buffer, png_uint_32 length) {
if (setjmp(this->jmpbuf)) {
png_destroy_read_struct(&this->png_ptr, &this->info_ptr, (png_infopp)NULL);
@@ -136,7 +137,7 @@ int process_data(image_decoder_t *this, png_bytep buffer, png_uint_32 length) {
* process png header (do some conversions if necessary)
*/
-void info_callback(png_structp png_ptr, png_infop info_ptr) {
+static void info_callback(png_structp png_ptr, png_infop info_ptr) {
int i;
image_decoder_t *this = png_get_progressive_ptr(png_ptr);
@@ -187,7 +188,7 @@ void info_callback(png_structp png_ptr, png_infop info_ptr) {
this->rows_valid = 1;
}
-void row_callback(png_structp png_ptr, png_bytep new_row,
+static void row_callback(png_structp png_ptr, png_bytep new_row,
png_uint_32 row_num, int pass) {
image_decoder_t *this = png_get_progressive_ptr(png_ptr);
@@ -208,7 +209,7 @@ void row_callback(png_structp png_ptr, png_bytep new_row,
#define ONE_HALF ( (int32_t) (1<< (SCALEBITS-1)) )
#define CBCR_OFFSET (CENTERSAMPLE << SCALEBITS)
-void end_callback(png_structp png_ptr, png_infop info) {
+static void end_callback(png_structp png_ptr, png_infop info) {
vo_frame_t *img; /* video out frame */
int row, col;
diff --git a/src/libxinevdec/interplayvideo.c b/src/libxinevdec/interplayvideo.c
index df770c10a..b47c338da 100644
--- a/src/libxinevdec/interplayvideo.c
+++ b/src/libxinevdec/interplayvideo.c
@@ -21,7 +21,7 @@
* For more information regarding the Interplay MVE format, visit:
* http://www.pcisys.net/~melanson/codecs/
*
- * $Id: interplayvideo.c,v 1.3 2003/08/04 03:47:10 miguelfreitas Exp $
+ * $Id: interplayvideo.c,v 1.4 2003/08/25 21:51:43 f1rmb Exp $
*/
#include <stdio.h>
@@ -131,7 +131,7 @@ typedef struct interplay_decoder_s {
pixel_ptr += this->width; \
}
-void interplay_decode_frame(interplay_decoder_t *this) {
+static void interplay_decode_frame(interplay_decoder_t *this) {
int pixel_ptr, motion_pixel_ptr;
int x, y;
diff --git a/src/libxinevdec/msrle.c b/src/libxinevdec/msrle.c
index aae46dba8..c185d33e0 100644
--- a/src/libxinevdec/msrle.c
+++ b/src/libxinevdec/msrle.c
@@ -21,7 +21,7 @@
* For more information on the MS RLE format, visit:
* http://www.pcisys.net/~melanson/codecs/
*
- * $Id: msrle.c,v 1.17 2003/08/04 03:47:10 miguelfreitas Exp $
+ * $Id: msrle.c,v 1.18 2003/08/25 21:51:43 f1rmb Exp $
*/
#include <stdio.h>
@@ -78,7 +78,7 @@ typedef struct msrle_decoder_s {
} \
stream_byte = this->buf[stream_ptr++];
-void decode_msrle8(msrle_decoder_t *this) {
+static void decode_msrle8(msrle_decoder_t *this) {
int stream_ptr = 0;
unsigned char rle_code;
diff --git a/src/libxinevdec/qtrpza.c b/src/libxinevdec/qtrpza.c
index 429b04dd5..568a30864 100644
--- a/src/libxinevdec/qtrpza.c
+++ b/src/libxinevdec/qtrpza.c
@@ -21,7 +21,7 @@
* For more information about the RPZA format, visit:
* http://www.pcisys.net/~melanson/codecs/
*
- * $Id: qtrpza.c,v 1.15 2003/08/04 03:47:10 miguelfreitas Exp $
+ * $Id: qtrpza.c,v 1.16 2003/08/25 21:51:43 f1rmb Exp $
*/
#include <stdio.h>
@@ -102,7 +102,7 @@ typedef struct qtrpza_decoder_s {
v_val = COMPUTE_V(r, g, b); \
}
-void decode_qtrpza(qtrpza_decoder_t *this) {
+static void decode_qtrpza(qtrpza_decoder_t *this) {
int i;
int stream_ptr = 0;
diff --git a/src/libxinevdec/qtsmc.c b/src/libxinevdec/qtsmc.c
index f658bf2a9..dcc17ac71 100644
--- a/src/libxinevdec/qtsmc.c
+++ b/src/libxinevdec/qtsmc.c
@@ -23,7 +23,7 @@
* For more information on the SMC format, visit:
* http://www.pcisys.net/~melanson/codecs/
*
- * $Id: qtsmc.c,v 1.15 2003/08/04 03:47:10 miguelfreitas Exp $
+ * $Id: qtsmc.c,v 1.16 2003/08/25 21:51:43 f1rmb Exp $
*/
#include <stdio.h>
@@ -102,7 +102,7 @@ typedef struct qtsmc_decoder_s {
} \
}
-void decode_qtsmc(qtsmc_decoder_t *this) {
+static void decode_qtsmc(qtsmc_decoder_t *this) {
int i;
int stream_ptr = 0;