Replace remaining occurrences of CODEC_TYPE_* with AVMEDIA_TYPE*

[ffmpeg] / libavcodec / huffman.h

diff --git a/libavcodec/huffman.h b/libavcodec/huffman.h
index ec3c0c9ab1b708fd6b34cbfe1c9530ee364fb43f..3c08e6fb1b9e8de6cae0aa77338e252c83a004d2 100644 (file)
--- a/libavcodec/huffman.h
+++ b/libavcodec/huffman.h
@@ -1,5 +1,5 @@
 /**
- * @file huffman.h
+ * @file
  * huffman tree builder and VLC generator
  * Copyright (C) 2007  Aurelien Jacobs <aurel@gnuage.org>
  *
@@ -24,6 +24,7 @@
 #define AVCODEC_HUFFMAN_H
 
 #include "avcodec.h"
+#include "get_bits.h"
 
 typedef struct {
     int16_t  sym;
@@ -31,8 +32,11 @@ typedef struct {
     uint32_t count;
 } Node;
 
-typedef int (*huff_cmp_t)(const void *va, const void *vb);
+#define FF_HUFFMAN_FLAG_HNODE_FIRST 0x01
+#define FF_HUFFMAN_FLAG_ZERO_COUNT  0x02
+
+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 hnode_first);
+                       Node *nodes, HuffCmp cmp, int flags);
 
 #endif /* AVCODEC_HUFFMAN_H */