Merge commit '4f81f8dba735c212efae077c4fec8ad4fe53b352'

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

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

diff --git a/libavcodec/ffv1.c b/libavcodec/ffv1.c
index 60eb523e45c279be0cb21d4562dd6d7446ca032c..80a9434eb7eb74445d6cc09ecd24a491247341ff 100644 (file)
--- 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 68d7282717e9d557f9d68d62b5f2913c8b34cd76..eec1aa1b880e5c85aab68807f09773ea546f3096 100644 (file)
--- 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 3e9b79ab447dbfedbc3d22091b4369a1c98538b5..7e2adda48f7c155264942800ab1ac41999cea6de 100644 (file)
--- 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 1f33b0cdfe51fa71785b1f130c18f1f8a1d56bde..6918a553f2621d5204c10522a3e8523c7d9519d6 100644 (file)
--- 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 5c816f45fdcb4bf380f5580a909266164fa26a88..d545fea48a9cb9e573b082ec6e46ce22fc7a2c6f 100644 (file)
--- 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"