aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorClément Bœsch <clement@stupeflix.com>2016-06-29 11:54:54 +0200
committerClément Bœsch <clement@stupeflix.com>2016-06-29 11:54:54 +0200
commitbef74ef367057b26fa3e5bb37db6dbdb8bfce159 (patch)
tree76498da69344d3e8d467e2884bb22f8f9bf61907
parent4b9574b275c24404093061b35b910b8ce1fa86b9 (diff)
parent4f81f8dba735c212efae077c4fec8ad4fe53b352 (diff)
downloadffmpeg-bef74ef367057b26fa3e5bb37db6dbdb8bfce159.tar.gz
Merge commit '4f81f8dba735c212efae077c4fec8ad4fe53b352'
* commit '4f81f8dba735c212efae077c4fec8ad4fe53b352': Drop unnecessary golomb.h #includes Merged-by: Clément Bœsch <clement@stupeflix.com>
-rw-r--r--libavcodec/ffv1.c1
-rw-r--r--libavcodec/h264_cabac.c1
-rw-r--r--libavcodec/h264_picture.c1
-rw-r--r--libavcodec/hevc_filter.c1
-rw-r--r--libavcodec/on2avc.c1
5 files changed, 0 insertions, 5 deletions
diff --git a/libavcodec/ffv1.c b/libavcodec/ffv1.c
index 60eb523e45..80a9434eb7 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 68d7282717..eec1aa1b88 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 3e9b79ab44..7e2adda48f 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 1f33b0cdfe..6918a553f2 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 5c816f45fd..d545fea48a 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"