Merge commit 'ffa190d0479d2370dd89c95692f822cbff2cc24c'

* commit 'ffa190d0479d2370dd89c95692f822cbff2cc24c':
  Move VLC and RL_VLC_ELEM structure definitions to a separate header

Merged-by: Clément Bœsch <u@pkh.me>

diff --cc libavcodec/bitstream.c
Simple merge

diff --cc libavcodec/get_bits.h
index 881dadd4f2d84f441f65e3c32d2342cabf7c42cb,66374f523d689323be8ec6954c8dd44534c8035b..d566b9c4d0ec62d166be5a562f628b1705a9c077
--- 1/libavcodec/get_bits.h
--- 2/libavcodec/get_bits.h
+++ b/libavcodec/get_bits.h
@@@ -31,8 -31,8 +31,9 @@@
  #include "libavutil/common.h"
  #include "libavutil/intreadwrite.h"
  #include "libavutil/log.h"
 +#include "libavutil/avassert.h"
  #include "mathops.h"
+ #include "vlc.h"
  
  /*
   * Safe bitstream reading:
@@@ -55,23 -55,11 +56,9 @@@ typedef struct GetBitContext 
      const uint8_t *buffer, *buffer_end;
      int index;
      int size_in_bits;
 -#if !UNCHECKED_BITSTREAM_READER
      int size_in_bits_plus8;
 -#endif
  } GetBitContext;
  
- #define VLC_TYPE int16_t
- 
- typedef struct VLC {
-     int bits;
-     VLC_TYPE (*table)[2]; ///< code, bits
-     int table_size, table_allocated;
- } VLC;
- 
- typedef struct RL_VLC_ELEM {
-     int16_t level;
-     int8_t len;
-     uint8_t run;
- } RL_VLC_ELEM;
- 
  /* Bitstream reader API docs:
   * name
   *   arbitrary name which is used as prefix for the internal variables

diff --cc libavcodec/huffman.c
index 1f5d8b9c05186c51f115215a46fba4960d9f98c9,3b15aa268445144c2afdfda5dab217832035fb90..a3d392065c4014ed369b722793bc0d337700222b
--- 1/libavcodec/huffman.c
--- 2/libavcodec/huffman.c
+++ b/libavcodec/huffman.c
@@@ -26,9 -26,11 +26,12 @@@
  
  #include <stdint.h>
  
 +#include "libavutil/qsort.h"
+ #include"libavutil/common.h"
+ 
  #include "avcodec.h"
  #include "huffman.h"
+ #include "vlc.h"
  
  /* symbol for Huffman tree node */
  #define HNODE -1

diff --cc libavcodec/huffman.h
Simple merge

diff --cc libavcodec/rl.c
Simple merge

diff --cc libavcodec/rl.h
Simple merge