Merge commit '4f81f8dba735c212efae077c4fec8ad4fe53b352'
authorClément Bœsch <clement@stupeflix.com>
Wed, 29 Jun 2016 09:54:54 +0000 (11:54 +0200)
committerClément Bœsch <clement@stupeflix.com>
Wed, 29 Jun 2016 09:54:54 +0000 (11:54 +0200)
* commit '4f81f8dba735c212efae077c4fec8ad4fe53b352':
  Drop unnecessary golomb.h #includes

Merged-by: Clément Bœsch <clement@stupeflix.com>
1  2 
libavcodec/ffv1.c
libavcodec/h264_cabac.c
libavcodec/h264_picture.c
libavcodec/hevc_filter.c
libavcodec/on2avc.c

   */
  
  #include "libavutil/attributes.h"
 +#include "libavutil/avassert.h"
 +#include "libavutil/crc.h"
 +#include "libavutil/opt.h"
 +#include "libavutil/imgutils.h"
 +#include "libavutil/pixdesc.h"
 +#include "libavutil/timer.h"
  
  #include "avcodec.h"
 -#include "put_bits.h"
 +#include "internal.h"
  #include "rangecoder.h"
- #include "golomb.h"
  #include "mathops.h"
  #include "ffv1.h"
  
Simple merge
Simple merge
  #include "libavutil/internal.h"
  
  #include "cabac_functions.h"
- #include "golomb.h"
  #include "hevc.h"
  
 +#include "bit_depth_template.c"
 +
  #define LUMA 0
  #define CB 1
  #define CR 2
Simple merge