[FFmpeg-cvslog] Merge commit '4f81f8dba735c212efae077c4fec8ad4fe53b352'

[Clément Bœsch]

ffmpeg | branch: master | Clément Bœsch <clement at stupeflix.com> | Wed Jun 29 11:54:54 2016 +0200| [bef74ef367057b26fa3e5bb37db6dbdb8bfce159] | committer: Clément Bœsch

Merge commit '4f81f8dba735c212efae077c4fec8ad4fe53b352'

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

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

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=bef74ef367057b26fa3e5bb37db6dbdb8bfce159
---

 libavcodec/ffv1.c         |    1 -
 libavcodec/h264_cabac.c   |    1 -
 libavcodec/h264_picture.c |    1 -
 libavcodec/hevc_filter.c  |    1 -
 libavcodec/on2avc.c       |    1 -
 5 files changed, 5 deletions(-)

diff --git a/libavcodec/ffv1.c b/libavcodec/ffv1.c
index 60eb523..80a9434 100644
--- a/libavcodec/ffv1.c
+++ b/libavcodec/ffv1.c
@@ -36,7 +36,6 @@
 #include "avcodec.h"
 #include "internal.h"
 #include "rangecoder.h"
-#include "golomb.h"
 #include "mathops.h"
 #include "ffv1.h"
 
diff --git a/libavcodec/h264_cabac.c b/libavcodec/h264_cabac.c
index 68d7282..eec1aa1 100644
--- a/libavcodec/h264_cabac.c
+++ b/libavcodec/h264_cabac.c
@@ -40,7 +40,6 @@
 #include "h264.h"
 #include "h264data.h"
 #include "h264_mvpred.h"
-#include "golomb.h"
 #include "mpegutils.h"
 
 #if ARCH_X86
diff --git a/libavcodec/h264_picture.c b/libavcodec/h264_picture.c
index 3e9b79a..7e2adda 100644
--- a/libavcodec/h264_picture.c
+++ b/libavcodec/h264_picture.c
@@ -37,7 +37,6 @@
 #include "h264data.h"
 #include "h264chroma.h"
 #include "h264_mvpred.h"
-#include "golomb.h"
 #include "mathops.h"
 #include "mpegutils.h"
 #include "rectangle.h"
diff --git a/libavcodec/hevc_filter.c b/libavcodec/hevc_filter.c
index 1f33b0c..6918a55 100644
--- a/libavcodec/hevc_filter.c
+++ b/libavcodec/hevc_filter.c
@@ -26,7 +26,6 @@
 #include "libavutil/internal.h"
 
 #include "cabac_functions.h"
-#include "golomb.h"
 #include "hevc.h"
 
 #include "bit_depth_template.c"
diff --git a/libavcodec/on2avc.c b/libavcodec/on2avc.c
index 5c816f4..d545fea 100644
--- a/libavcodec/on2avc.c
+++ b/libavcodec/on2avc.c
@@ -27,7 +27,6 @@
 #include "bytestream.h"
 #include "fft.h"
 #include "get_bits.h"
-#include "golomb.h"
 #include "internal.h"
 
 #include "on2avcdata.h"


======================================================================

diff --cc libavcodec/ffv1.c
index 60eb523,89d27bb..80a9434
--- a/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/hevc_filter.c
index 1f33b0c,39ac4ee..6918a55
--- a/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