summaryrefslogtreecommitdiff
path: root/libavcodec/h264_cabac.c
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 /libavcodec/h264_cabac.c
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>
Diffstat (limited to 'libavcodec/h264_cabac.c')
-rw-r--r--libavcodec/h264_cabac.c1
1 files changed, 0 insertions, 1 deletions
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