[FFmpeg-cvslog] avformat: fix hevcs use of golomb from avformat

Michael Niedermayer git at videolan.org
Tue Mar 11 11:57:15 CET 2014


ffmpeg | branch: release/2.2 | Michael Niedermayer <michaelni at gmx.at> | Sun Mar  9 22:59:46 2014 +0100| [95ddd2227baae94c94d5aa3db6d22ddf5879e7e1] | committer: Michael Niedermayer

avformat: fix hevcs use of golomb from avformat

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit cb403b2570385cbf48a11f9f48441de5cd01171e)

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

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

 libavformat/Makefile     |    2 +-
 libavformat/golomb_tab.c |    1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/libavformat/Makefile b/libavformat/Makefile
index 6465c17..65845c7 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 0000000..063fae3
--- /dev/null
+++ b/libavformat/golomb_tab.c
@@ -0,0 +1 @@
+#include "libavcodec/golomb.c"



More information about the ffmpeg-cvslog mailing list