cook: Make constants passed to AV_BE2NE32C() unsigned to avoid signed overflow.

[ffmpeg] / libavcodec / huffman.h

diff --git a/libavcodec/huffman.h b/libavcodec/huffman.h
index 57fbefa1e9c6dbfac3ba09018135f3e3b47065d9..5625313ac7dd6d4752c342424d2e35ed9bc1186a 100644 (file)
--- a/libavcodec/huffman.h
+++ b/libavcodec/huffman.h
@@ -1,30 +1,33 @@
-/**
- * @file huffman.h
- * huffman tree builder and VLC generator
+/*
  * Copyright (C) 2007  Aurelien Jacobs <aurel@gnuage.org>
  *
- * This file is part of FFmpeg.
+ * This file is part of Libav.
  *
- * FFmpeg is free software; you can redistribute it and/or
+ * Libav is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation; either
  * version 2.1 of the License, or (at your option) any later version.
  *
- * FFmpeg is distributed in the hope that it will be useful,
+ * Libav is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with FFmpeg; if not, write to the Free Software
+ * License along with Libav; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef FFMPEG_HUFFMAN_H
-#define FFMPEG_HUFFMAN_H
+/**
+ * @file
+ * huffman tree builder and VLC generator
+ */
+
+#ifndef AVCODEC_HUFFMAN_H
+#define AVCODEC_HUFFMAN_H
 
 #include "avcodec.h"
-#include "bitstream.h"
+#include "get_bits.h"
 
 typedef struct {
     int16_t  sym;
@@ -32,8 +35,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 /* FFMPEG_HUFFMAN_H */
+#endif /* AVCODEC_HUFFMAN_H */