sparc: fix a few pages of cast warnings

[ffmpeg] / libavcodec / huffman.h

diff --git a/libavcodec/huffman.h b/libavcodec/huffman.h
index 0b11af8b45dc8a01c129b9285c23a5d52673a9ac..d56c7274b0ea4598f8c5dced1ed148af775a3cf9 100644 (file)
--- a/libavcodec/huffman.h
+++ b/libavcodec/huffman.h
@@ -1,5 +1,5 @@
 /**
- * @file huffman.h
+ * @file libavcodec/huffman.h
  * huffman tree builder and VLC generator
  * Copyright (C) 2007  Aurelien Jacobs <aurel@gnuage.org>
  *
@@ -24,7 +24,7 @@
 #define AVCODEC_HUFFMAN_H
 
 #include "avcodec.h"
-#include "bitstream.h"
+#include "get_bits.h"
 
 typedef struct {
     int16_t  sym;
@@ -35,8 +35,8 @@ typedef struct {
 #define FF_HUFFMAN_FLAG_HNODE_FIRST 0x01
 #define FF_HUFFMAN_FLAG_ZERO_COUNT  0x02
 
-typedef int (*huff_cmp_t)(const void *va, const void *vb);
+typedef int (*HuffCmp)(const void *va, const void *vb);
 int ff_huff_build_tree(AVCodecContext *avctx, VLC *vlc, int nb_codes,
-                       Node *nodes, huff_cmp_t cmp, int flags);
+                       Node *nodes, HuffCmp cmp, int flags);
 
 #endif /* AVCODEC_HUFFMAN_H */