Merge commit 'ffa190d0479d2370dd89c95692f822cbff2cc24c'
authorClément Bœsch <u@pkh.me>
Wed, 22 Jun 2016 22:29:25 +0000 (00:29 +0200)
committerClément Bœsch <u@pkh.me>
Wed, 22 Jun 2016 22:29:25 +0000 (00:29 +0200)
* commit 'ffa190d0479d2370dd89c95692f822cbff2cc24c':
  Move VLC and RL_VLC_ELEM structure definitions to a separate header

Merged-by: Clément Bœsch <u@pkh.me>
1  2 
libavcodec/bitstream.c
libavcodec/get_bits.h
libavcodec/huffman.c
libavcodec/huffman.h
libavcodec/rl.c
libavcodec/rl.h

Simple merge
@@@ -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
  
  #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
Simple merge
diff --cc libavcodec/rl.c
Simple merge
diff --cc libavcodec/rl.h
Simple merge