aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-03-09 22:59:46 +0100
committerMichael Niedermayer <michaelni@gmx.at>2014-03-09 22:59:46 +0100
commitcb403b2570385cbf48a11f9f48441de5cd01171e (patch)
tree43a88fa00eb40108198dcdd0f8b1122b1446dea5
parent1b1d77ae9b38fb257e9ae9fb565091c6b7e43181 (diff)
downloadffmpeg-cb403b2570385cbf48a11f9f48441de5cd01171e.tar.gz
avformat: fix hevcs use of golomb from avformat
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
-rw-r--r--libavformat/Makefile2
-rw-r--r--libavformat/golomb_tab.c1
2 files changed, 2 insertions, 1 deletions
diff --git a/libavformat/Makefile b/libavformat/Makefile
index a7ad345457..d3cf8efdda 100644
--- a/libavformat/Makefile
+++ b/libavformat/Makefile
@@ -50,7 +50,7 @@ OBJS-$(CONFIG_RTPDEC) += rdt.o \
rtpdec_xiph.o \
srtp.o
OBJS-$(CONFIG_RTPENC_CHAIN) += rtpenc_chain.o rtp.o
-OBJS-$(CONFIG_SHARED) += log2_tab.o
+OBJS-$(CONFIG_SHARED) += log2_tab.o golomb_tab.o
# muxers/demuxers
OBJS-$(CONFIG_A64_MUXER) += a64.o rawenc.o
diff --git a/libavformat/golomb_tab.c b/libavformat/golomb_tab.c
new file mode 100644
index 0000000000..063fae3647
--- /dev/null
+++ b/libavformat/golomb_tab.c
@@ -0,0 +1 @@
+#include "libavcodec/golomb.c"