define FLAC metadata types in flac.h

[ffmpeg] / libavcodec / huffman.h

diff --git a/libavcodec/huffman.h b/libavcodec/huffman.h
index 650700be8cfe5f20b09adf6c849f386e9db7b98f..bfb772334a8d9137761010dcea116bbaa7ea625c 100644 (file)
--- a/libavcodec/huffman.h
+++ b/libavcodec/huffman.h
@@ -20,8 +20,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef FFMPEG_HUFFMAN_H
-#define FFMPEG_HUFFMAN_H
+#ifndef AVCODEC_HUFFMAN_H
+#define AVCODEC_HUFFMAN_H
 
 #include "avcodec.h"
 #include "bitstream.h"
@@ -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 /* FFMPEG_HUFFMAN_H */
+#endif /* AVCODEC_HUFFMAN_H */