Merge commit '4f81f8dba735c212efae077c4fec8ad4fe53b352'

* commit '4f81f8dba735c212efae077c4fec8ad4fe53b352':
  Drop unnecessary golomb.h #includes

Merged-by: Clément Bœsch <clement@stupeflix.com>

diff --cc libavcodec/ffv1.c
index 60eb523e45c279be0cb21d4562dd6d7446ca032c,89d27bbca1bc5dd491a27716996e86ce3c3d1fae..80a9434eb7eb74445d6cc09ecd24a491247341ff
--- 1/libavcodec/ffv1.c
--- 2/libavcodec/ffv1.c
+++ b/libavcodec/ffv1.c
@@@ -26,17 -26,10 +26,16 @@@
   */
  
  #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"
  

diff --cc libavcodec/h264_cabac.c
Simple merge

diff --cc libavcodec/h264_picture.c
Simple merge

diff --cc libavcodec/hevc_filter.c
index 1f33b0cdfe51fa71785b1f130c18f1f8a1d56bde,39ac4eef8e37a6abb21604bf6578fcc5ea738a3b..6918a553f2621d5204c10522a3e8523c7d9519d6
--- 1/libavcodec/hevc_filter.c
--- 2/libavcodec/hevc_filter.c
+++ b/libavcodec/hevc_filter.c
@@@ -26,11 -26,8 +26,10 @@@
  #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

diff --cc libavcodec/on2avc.c
Simple merge