Replace remaining occurrences of CODEC_TYPE_* with AVMEDIA_TYPE*

[ffmpeg] / libavcodec / huffman.c

diff --git a/libavcodec/huffman.c b/libavcodec/huffman.c
index d41dabbe5d33fe91aba1e4f6ed7235feeb174661..853fa64a48e9aa62d6410af50276818919350202 100644 (file)
--- a/libavcodec/huffman.c
+++ b/libavcodec/huffman.c
@@ -1,5 +1,5 @@
 /**
- * @file huffman.c
+ * @file
  * huffman tree builder and VLC generator
  * Copyright (c) 2006 Konstantin Shishkov
  *
@@ -21,7 +21,7 @@
  */
 
 #include "avcodec.h"
-#include "bitstream.h"
+#include "get_bits.h"
 #include "huffman.h"
 
 /* symbol for Huffman tree node */
@@ -67,7 +67,7 @@ static int build_huff_tree(VLC *vlc, Node *nodes, int head, int flags)
  * first nb_codes nodes.count must be set
  */
 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)
 {
     int i, j;
     int cur_node;