Merge commit '31dc73e92a96f08d07650c0e7d31c0b9a1465d46'

[ffmpeg] / libavcodec / huffman.c

diff --git a/libavcodec/huffman.c b/libavcodec/huffman.c
index 2866eef31010c00c3e03a66867373897d7da3289..c771bcfe08bee0e0b1fa7d9352e14d82a3ceab81 100644 (file)
--- a/libavcodec/huffman.c
+++ b/libavcodec/huffman.c
@@ -33,7 +33,7 @@
 /* symbol for Huffman tree node */
 #define HNODE -1
 
-typedef struct {
+typedef struct HeapElem {
     uint64_t val;
     int name;
 } HeapElem;
@@ -62,7 +62,7 @@ int ff_huff_gen_len_table(uint8_t *dst, const uint64_t *stats, int stats_size, i
     int size = 0;
     int ret = 0;
 
-    if (!h || !up || !len) {
+    if (!h || !up || !len || !map) {
         ret = AVERROR(ENOMEM);
         goto end;
     }