diff --git a/Makefile b/Makefile index b1a34ec9..b37bf23c 100644 --- a/Makefile +++ b/Makefile @@ -19,7 +19,6 @@ USE_BPGVIEW=y # Installation prefix prefix=/usr/local - ################################# ifdef CONFIG_WIN32 @@ -40,12 +39,16 @@ PWD:=$(shell pwd) CFLAGS:=-Os -Wall -MMD -fno-asynchronous-unwind-tables -fdata-sections -ffunction-sections -fno-math-errno -fno-signed-zeros -fno-tree-vectorize -fomit-frame-pointer CFLAGS+=-D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_REENTRANT -CFLAGS+=-I. +CFLAGS+=-I./src CFLAGS+=-DCONFIG_BPG_VERSION=\"$(shell cat VERSION)\" ifdef USE_JCTVC_HIGH_BIT_DEPTH CFLAGS+=-DRExt__HIGH_BIT_DEPTH_SUPPORT endif +ifneq ($(shell uname -m), i386) + CFLAGS += -fPIC +endif + # Emscriptem config EMLDFLAGS:=-s "EXPORTED_FUNCTIONS=['_bpg_decoder_open','_bpg_decoder_decode','_bpg_decoder_get_info','_bpg_decoder_start','_bpg_decoder_get_frame_duration','_bpg_decoder_get_line','_bpg_decoder_close','_malloc','_free']" EMLDFLAGS+=-s NO_FILESYSTEM=1 -s NO_BROWSER=1 @@ -72,18 +75,34 @@ endif all: $(PROGS) -LIBBPG_OBJS:=$(addprefix libavcodec/, \ -hevc_cabac.o hevc_filter.o hevc.o hevcpred.o hevc_refs.o\ -hevcdsp.o hevc_mvs.o hevc_ps.o hevc_sei.o\ -utils.o cabac.o golomb.o videodsp.o ) -LIBBPG_OBJS+=$(addprefix libavutil/, mem.o buffer.o log2_tab.o frame.o pixdesc.o md5.o ) -LIBBPG_OBJS+=libbpg.o - -LIBBPG_JS_OBJS:=$(patsubst %.o, %.js.o, $(LIBBPG_OBJS)) tmalloc.js.o - -LIBBPG_JS8_OBJS:=$(patsubst %.o, %.js8.o, $(LIBBPG_OBJS)) tmalloc.js8.o - -LIBBPG_JS8A_OBJS:=$(patsubst %.o, %.js8a.o, $(LIBBPG_OBJS)) tmalloc.js8a.o +LIBBPG_OBJS:=$(addprefix src/libavcodec/, \ + hevc_cabac.o \ + hevc_filter.o \ + hevc.o \ + hevcpred.o \ + hevc_refs.o \ + hevcdsp.o \ + hevc_mvs.o \ + hevc_ps.o \ + hevc_sei.o\ + utils.o \ + cabac.o \ + golomb.o \ + videodsp.o ) +LIBBPG_OBJS+=$(addprefix src/libavutil/, \ + mem.o \ + buffer.o \ + log2_tab.o \ + frame.o \ + pixdesc.o \ + md5.o ) +LIBBPG_OBJS+=src/libbpg.o + +LIBBPG_JS_OBJS:=$(patsubst %.o, %.js.o, $(LIBBPG_OBJS)) src/tmalloc.js.o + +LIBBPG_JS8_OBJS:=$(patsubst %.o, %.js8.o, $(LIBBPG_OBJS)) src/tmalloc.js8.o + +LIBBPG_JS8A_OBJS:=$(patsubst %.o, %.js8a.o, $(LIBBPG_OBJS)) src/tmalloc.js8a.o $(LIBBPG_OBJS): CFLAGS+=-D_ISOC99_SOURCE -D_POSIX_C_SOURCE=200112 -D_XOPEN_SOURCE=600 -DHAVE_AV_CONFIG_H -std=c99 -D_GNU_SOURCE=1 -DUSE_VAR_BIT_DEPTH -DUSE_PRED @@ -93,41 +112,75 @@ $(LIBBPG_JS8_OBJS): EMCFLAGS+=-D_ISOC99_SOURCE -D_POSIX_C_SOURCE=200112 -D_XOPEN $(LIBBPG_JS8A_OBJS): EMCFLAGS+=-D_ISOC99_SOURCE -D_POSIX_C_SOURCE=200112 -D_XOPEN_SOURCE=600 -DHAVE_AV_CONFIG_H -std=c99 -D_GNU_SOURCE=1 -DUSE_PRED -BPGENC_OBJS:=bpgenc.o +BPGENC_OBJS:=src/bpgenc.o BPGENC_LIBS:= ifdef USE_X265 -BPGENC_OBJS+=x265_glue.o +BPGENC_OBJS+=src/x265_glue.o BPGENC_LIBS+= -lx265 -bpgenc.o: CFLAGS+=-DUSE_X265 +src/bpgenc.o: CFLAGS+=-DUSE_X265 endif # USE_X265 ifdef USE_JCTVC -JCTVC_OBJS=$(addprefix jctvc/TLibEncoder/, SyntaxElementWriter.o TEncSbac.o \ -TEncBinCoderCABACCounter.o TEncGOP.o\ -TEncSampleAdaptiveOffset.o TEncBinCoderCABAC.o TEncAnalyze.o\ -TEncEntropy.o TEncTop.o SEIwrite.o TEncPic.o TEncRateCtrl.o\ -WeightPredAnalysis.o TEncSlice.o TEncCu.o NALwrite.o TEncCavlc.o\ -TEncSearch.o TEncPreanalyzer.o) -JCTVC_OBJS+=jctvc/TLibVideoIO/TVideoIOYuv.o -JCTVC_OBJS+=$(addprefix jctvc/TLibCommon/, TComWeightPrediction.o TComLoopFilter.o\ -TComBitStream.o TComMotionInfo.o TComSlice.o ContextModel3DBuffer.o\ -TComPic.o TComRdCostWeightPrediction.o TComTU.o TComPicSym.o\ -TComPicYuv.o TComYuv.o TComTrQuant.o TComInterpolationFilter.o\ -ContextModel.o TComSampleAdaptiveOffset.o SEI.o TComPrediction.o\ -TComDataCU.o TComChromaFormat.o Debug.o TComRom.o\ -TComPicYuvMD5.o TComRdCost.o TComPattern.o TComCABACTables.o) -JCTVC_OBJS+=jctvc/libmd5/libmd5.o -JCTVC_OBJS+=jctvc/TAppEncCfg.o jctvc/TAppEncTop.o jctvc/program_options_lite.o - -$(JCTVC_OBJS) jctvc_glue.o: CFLAGS+=-I$(PWD)/jctvc -Wno-sign-compare - -jctvc/libjctvc.a: $(JCTVC_OBJS) +JCTVC_OBJS=$(addprefix src/jctvc/TLibEncoder/, \ + SyntaxElementWriter.o \ + TEncSbac.o \ + TEncBinCoderCABACCounter.o \ + TEncGOP.o \ + TEncSampleAdaptiveOffset.o \ + TEncBinCoderCABAC.o \ + TEncAnalyze.o \ + TEncEntropy.o \ + TEncTop.o \ + SEIwrite.o \ + TEncPic.o \ + TEncRateCtrl.o \ + WeightPredAnalysis.o \ + TEncSlice.o \ + TEncCu.o \ + NALwrite.o \ + TEncCavlc.o \ + TEncSearch.o \ + TEncPreanalyzer.o) +JCTVC_OBJS+=src/jctvc/TLibVideoIO/TVideoIOYuv.o +JCTVC_OBJS+=$(addprefix src/jctvc/TLibCommon/, \ + TComWeightPrediction.o \ + TComLoopFilter.o \ + TComBitStream.o \ + TComMotionInfo.o \ + TComSlice.o \ + ContextModel3DBuffer.o \ + TComPic.o \ + TComRdCostWeightPrediction.o \ + TComTU.o \ + TComPicSym.o \ + TComPicYuv.o \ + TComYuv.o \ + TComTrQuant.o \ + TComInterpolationFilter.o \ + ContextModel.o \ + TComSampleAdaptiveOffset.o \ + SEI.o \ + TComPrediction.o \ + TComDataCU.o \ + TComChromaFormat.o \ + Debug.o \ + TComRom.o\ + TComPicYuvMD5.o \ + TComRdCost.o \ + TComPattern.o \ + TComCABACTables.o) +JCTVC_OBJS+=src/jctvc/libmd5/libmd5.o +JCTVC_OBJS+=src/jctvc/TAppEncCfg.o src/jctvc/TAppEncTop.o src/jctvc/program_options_lite.o + +$(JCTVC_OBJS) src/jctvc_glue.o: CFLAGS+=-I$(PWD)/src/jctvc -Wno-sign-compare + +src/jctvc/libjctvc.a: $(JCTVC_OBJS) $(AR) rcs $@ $^ -BPGENC_OBJS+=jctvc_glue.o jctvc/libjctvc.a +BPGENC_OBJS+=src/jctvc_glue.o src/jctvc/libjctvc.a -bpgenc.o: CFLAGS+=-DUSE_JCTVC +src/bpgenc.o: CFLAGS+=-DUSE_JCTVC endif # USE_JCTVC @@ -153,27 +206,27 @@ BPGVIEW_LIBS:=-lSDL_image -lSDL $(LIBS) endif #!CONFIG_WIN32 -bpgenc.o: CFLAGS+=-Wno-unused-but-set-variable +src/bpgenc.o: CFLAGS+=-Wno-unused-but-set-variable libbpg.a: $(LIBBPG_OBJS) $(AR) rcs $@ $^ -bpgdec$(EXE): bpgdec.o libbpg.a +bpgdec$(EXE): src/bpgdec.o libbpg.a $(CC) $(LDFLAGS) -o $@ $^ $(BPGDEC_LIBS) bpgenc$(EXE): $(BPGENC_OBJS) $(CXX) $(LDFLAGS) -o $@ $^ $(BPGENC_LIBS) -bpgview$(EXE): bpgview.o libbpg.a +bpgview$(EXE): src/bpgview.o libbpg.a $(CC) $(LDFLAGS) -o $@ $^ $(BPGVIEW_LIBS) -bpgdec.js: $(LIBBPG_JS_OBJS) post.js +bpgdec.js: $(LIBBPG_JS_OBJS) src/post.js $(EMCC) $(EMLDFLAGS) -s TOTAL_MEMORY=33554432 -o $@ $(LIBBPG_JS_OBJS) -bpgdec8.js: $(LIBBPG_JS8_OBJS) post.js +bpgdec8.js: $(LIBBPG_JS8_OBJS) src/post.js $(EMCC) $(EMLDFLAGS) -s TOTAL_MEMORY=16777216 -o $@ $(LIBBPG_JS8_OBJS) -bpgdec8a.js: $(LIBBPG_JS8A_OBJS) post.js +bpgdec8a.js: $(LIBBPG_JS8A_OBJS) src/post.js $(EMCC) $(EMLDFLAGS) -s TOTAL_MEMORY=16777216 -o $@ $(LIBBPG_JS8A_OBJS) size: @@ -184,11 +237,13 @@ size: install: bpgenc bpgdec install -s -m 755 $^ $(prefix)/bin -CLEAN_DIRS=doc html libavcodec libavutil \ - jctvc jctvc/TLibEncoder jctvc/TLibVideoIO jctvc/TLibCommon jctvc/libmd5 +CLEAN_DIRS=doc html src/libavcodec src/libavutil \ + src/jctvc src/jctvc/TLibEncoder src/jctvc/TLibVideoIO \ + src/jctvc/TLibCommon src/jctvc/libmd5 clean: - rm -f $(PROGS) *.o *.a *.d *~ $(addsuffix /*.o, $(CLEAN_DIRS)) \ + rm -f $(PROGS) $(BPGENC_OBJS) $(LIBBPG_OBJS) $(JCTVC_OBJS) \ + src/*.o *.a src/*.d src/*~ $(addsuffix /*.o, $(CLEAN_DIRS)) \ $(addsuffix /*.d, $(CLEAN_DIRS)) $(addsuffix /*~, $(CLEAN_DIRS)) \ $(addsuffix /*.a, $(CLEAN_DIRS)) @@ -207,11 +262,11 @@ clean: %.js8a.o: %.c $(EMCC) $(EMCFLAGS) -c -o $@ $< --include $(wildcard *.d) --include $(wildcard libavcodec/*.d) --include $(wildcard libavutil/*.d) --include $(wildcard jctvc/*.d) --include $(wildcard jctvc/TLibEncoder/*.d) --include $(wildcard jctvc/TLibVideoIO/*.d) --include $(wildcard jctvc/TLibCommon/*.d) --include $(wildcard jctvc/libmd5/*.d) +-include $(wildcard src/*.d) +-include $(wildcard src/libavcodec/*.d) +-include $(wildcard src/libavutil/*.d) +-include $(wildcard src/jctvc/*.d) +-include $(wildcard src/jctvc/TLibEncoder/*.d) +-include $(wildcard src/jctvc/TLibVideoIO/*.d) +-include $(wildcard src/jctvc/TLibCommon/*.d) +-include $(wildcard src/jctvc/libmd5/*.d) diff --git a/Makefile.shared b/Makefile.shared new file mode 100644 index 00000000..3034b22d --- /dev/null +++ b/Makefile.shared @@ -0,0 +1,278 @@ +# libbpg Makefile +# +# Compile options: +# +# Enable compilation of Javascript decoder with Emscripten +#USE_EMCC=y +# Enable x265 for the encoder (you must install it before) +#USE_X265=y +# Enable the JCTVC code (best quality but slow) for the encoder +USE_JCTVC=y +# Compile bpgview (SDL and SDL_image libraries needed) +USE_BPGVIEW=y +# Enable it to use bit depths > 12 (need more tests to validate encoder) +#USE_JCTVC_HIGH_BIT_DEPTH=y +# Enable the cross compilation for Windows +#CONFIG_WIN32=y +# Enable for compilation on MacOS X +#CONFIG_APPLE=y +# Installation prefix +prefix=/usr/local + +################################# + +ifdef CONFIG_WIN32 +#CROSS_PREFIX:=x86_64-w64-mingw32- +CROSS_PREFIX=i686-w64-mingw32- +EXE:=.exe +else +CROSS_PREFIX:= +EXE:= +endif + +CC=$(CROSS_PREFIX)gcc +CXX=$(CROSS_PREFIX)g++ +AR=$(CROSS_PREFIX)ar +EMCC=emcc + +PWD:=$(shell pwd) + +CFLAGS:=-Os -Wall -MMD -fno-asynchronous-unwind-tables -fdata-sections -ffunction-sections -fno-math-errno -fno-signed-zeros -fno-tree-vectorize -fomit-frame-pointer +CFLAGS+=-D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_REENTRANT +CFLAGS+=-I./src +CFLAGS+=-DCONFIG_BPG_VERSION=\"$(shell cat VERSION)\" +ifdef USE_JCTVC_HIGH_BIT_DEPTH +CFLAGS+=-DRExt__HIGH_BIT_DEPTH_SUPPORT +endif + +ifneq ($(shell uname -m), i386) + CFLAGS += -fPIC +endif + +# Emscriptem config +EMLDFLAGS:=-s "EXPORTED_FUNCTIONS=['_bpg_decoder_open','_bpg_decoder_decode','_bpg_decoder_get_info','_bpg_decoder_start','_bpg_decoder_get_frame_duration','_bpg_decoder_get_line','_bpg_decoder_close','_malloc','_free']" +EMLDFLAGS+=-s NO_FILESYSTEM=1 -s NO_BROWSER=1 +#EMLDFLAGS+=-O1 --post-js post.js +EMLDFLAGS+=-O3 --memory-init-file 0 --closure 1 --post-js post.js +EMCFLAGS:=$(CFLAGS) + +LDFLAGS=-g +ifdef CONFIG_APPLE +LDFLAGS+=-Wl,-dead_strip +else +LDFLAGS+=-Wl,--gc-sections +endif +CFLAGS+=-g +CXXFLAGS=$(CFLAGS) + +PROGS=bpgdec$(EXE) bpgenc$(EXE) +ifdef USE_BPGVIEW +PROGS+=bpgview$(EXE) +endif +ifdef USE_EMCC +PROGS+=bpgdec.js bpgdec8.js bpgdec8a.js +endif + +all: $(PROGS) + +LIBBPG_OBJS:=$(addprefix src/libavcodec/, \ + hevc_cabac.o \ + hevc_filter.o \ + hevc.o \ + hevcpred.o \ + hevc_refs.o \ + hevcdsp.o \ + hevc_mvs.o \ + hevc_ps.o \ + hevc_sei.o\ + utils.o \ + cabac.o \ + golomb.o \ + videodsp.o ) +LIBBPG_OBJS+=$(addprefix src/libavutil/, \ + mem.o \ + buffer.o \ + log2_tab.o \ + frame.o \ + pixdesc.o \ + md5.o ) +LIBBPG_OBJS+=src/libbpg.o + +LIBBPG_JS_OBJS:=$(patsubst %.o, %.js.o, $(LIBBPG_OBJS)) src/tmalloc.js.o + +LIBBPG_JS8_OBJS:=$(patsubst %.o, %.js8.o, $(LIBBPG_OBJS)) src/tmalloc.js8.o + +LIBBPG_JS8A_OBJS:=$(patsubst %.o, %.js8a.o, $(LIBBPG_OBJS)) src/tmalloc.js8a.o + +$(LIBBPG_OBJS): CFLAGS+=-D_ISOC99_SOURCE -D_POSIX_C_SOURCE=200112 -D_XOPEN_SOURCE=600 -DHAVE_AV_CONFIG_H -std=c99 -D_GNU_SOURCE=1 -DUSE_VAR_BIT_DEPTH -DUSE_PRED + +$(LIBBPG_JS_OBJS): EMCFLAGS+=-D_ISOC99_SOURCE -D_POSIX_C_SOURCE=200112 -D_XOPEN_SOURCE=600 -DHAVE_AV_CONFIG_H -std=c99 -D_GNU_SOURCE=1 -DUSE_VAR_BIT_DEPTH + +$(LIBBPG_JS8_OBJS): EMCFLAGS+=-D_ISOC99_SOURCE -D_POSIX_C_SOURCE=200112 -D_XOPEN_SOURCE=600 -DHAVE_AV_CONFIG_H -std=c99 -D_GNU_SOURCE=1 + +$(LIBBPG_JS8A_OBJS): EMCFLAGS+=-D_ISOC99_SOURCE -D_POSIX_C_SOURCE=200112 -D_XOPEN_SOURCE=600 -DHAVE_AV_CONFIG_H -std=c99 -D_GNU_SOURCE=1 -DUSE_PRED + +BPGENC_OBJS:=src/bpgenc.o +BPGENC_LIBS:= + +ifdef USE_X265 +BPGENC_OBJS+=src/x265_glue.o +BPGENC_LIBS+= -lx265 +src/bpgenc.o: CFLAGS+=-DUSE_X265 +endif # USE_X265 + +ifdef USE_JCTVC +JCTVC_OBJS=$(addprefix src/jctvc/TLibEncoder/, \ + SyntaxElementWriter.o \ + TEncSbac.o \ + TEncBinCoderCABACCounter.o \ + TEncGOP.o \ + TEncSampleAdaptiveOffset.o \ + TEncBinCoderCABAC.o \ + TEncAnalyze.o \ + TEncEntropy.o \ + TEncTop.o \ + SEIwrite.o \ + TEncPic.o \ + TEncRateCtrl.o \ + WeightPredAnalysis.o \ + TEncSlice.o \ + TEncCu.o \ + NALwrite.o \ + TEncCavlc.o \ + TEncSearch.o \ + TEncPreanalyzer.o) +JCTVC_OBJS+=src/jctvc/TLibVideoIO/TVideoIOYuv.o +JCTVC_OBJS+=$(addprefix src/jctvc/TLibCommon/, \ + TComWeightPrediction.o \ + TComLoopFilter.o \ + TComBitStream.o \ + TComMotionInfo.o \ + TComSlice.o \ + ContextModel3DBuffer.o \ + TComPic.o \ + TComRdCostWeightPrediction.o \ + TComTU.o \ + TComPicSym.o \ + TComPicYuv.o \ + TComYuv.o \ + TComTrQuant.o \ + TComInterpolationFilter.o \ + ContextModel.o \ + TComSampleAdaptiveOffset.o \ + SEI.o \ + TComPrediction.o \ + TComDataCU.o \ + TComChromaFormat.o \ + Debug.o \ + TComRom.o\ + TComPicYuvMD5.o \ + TComRdCost.o \ + TComPattern.o \ + TComCABACTables.o) +JCTVC_OBJS+=src/jctvc/libmd5/libmd5.o +JCTVC_OBJS+=src/jctvc/TAppEncCfg.o src/jctvc/TAppEncTop.o src/jctvc/program_options_lite.o + +$(JCTVC_OBJS) src/jctvc_glue.o: CFLAGS+=-I$(PWD)/src/jctvc -Wno-sign-compare + +src/jctvc/libjctvc.a: $(JCTVC_OBJS) + $(AR) rcs $@ $^ + +libbpgenc.so.0: $(JCTVC_OBJS) + $(CC) -shared -Wall -Wl,-soname,$@ $^ -o $@ $(BPGENC_LIBS) + +BPGENC_OBJS+=src/jctvc_glue.o libbpgenc.so.0 + +src/bpgenc.o: CFLAGS+=-DUSE_JCTVC +endif # USE_JCTVC + + +ifdef CONFIG_WIN32 + +LDFLAGS+=-static +BPGDEC_LIBS:=-Wl,-dy -lpng -lz -Wl,-dn +BPGENC_LIBS+=-Wl,-dy -lpng -ljpeg -lz -Wl,-dn +BPGVIEW_LIBS:=-lmingw32 -lSDLmain -Wl,-dy -lSDL_image -lSDL -Wl,-dn -mwindows + +else + +ifdef CONFIG_APPLE +LIBS:= +else +LIBS:=-lrt +endif # !CONFIG_APPLE +LIBS+=-lm -lpthread + +BPGDEC_LIBS:=-lpng $(LIBS) +BPGENC_LIBS+=-lpng -ljpeg $(LIBS) +BPGVIEW_LIBS:=-lSDL_image -lSDL $(LIBS) + +endif #!CONFIG_WIN32 + +src/bpgenc.o: CFLAGS+=-Wno-unused-but-set-variable + +libbpg.a: $(LIBBPG_OBJS) + $(AR) rcs $@ $^ + +libbpgdec.so.0: $(LIBBPG_OBJS) + $(CC) -shared -Wall -Wl,-soname,$@ $^ -o $@ $(BPGDEC_LIBS) + +bpgdec$(EXE): src/bpgdec.o libbpgdec.so.0 + $(CC) $(LDFLAGS) -o $@ $^ $(BPGDEC_LIBS) + +bpgenc$(EXE): $(BPGENC_OBJS) libbpgenc.so.0 + $(CXX) $(LDFLAGS) -o $@ $^ $(BPGENC_LIBS) + +bpgview$(EXE): src/bpgview.o libbpgdec.so.0 + $(CC) $(LDFLAGS) -o $@ $^ $(BPGVIEW_LIBS) + +bpgdec.js: $(LIBBPG_JS_OBJS) src/post.js + $(EMCC) $(EMLDFLAGS) -s TOTAL_MEMORY=33554432 -o $@ $(LIBBPG_JS_OBJS) + +bpgdec8.js: $(LIBBPG_JS8_OBJS) src/post.js + $(EMCC) $(EMLDFLAGS) -s TOTAL_MEMORY=16777216 -o $@ $(LIBBPG_JS8_OBJS) + +bpgdec8a.js: $(LIBBPG_JS8A_OBJS) src/post.js + $(EMCC) $(EMLDFLAGS) -s TOTAL_MEMORY=16777216 -o $@ $(LIBBPG_JS8A_OBJS) + +size: + strip bpgdec + size bpgdec libbpg.o libavcodec/*.o libavutil/*.o | sort -n + gzip < bpgdec | wc + +install: bpgenc bpgdec + install -s -m 755 $^ $(prefix)/bin + +CLEAN_DIRS=doc html src/libavcodec src/libavutil \ + src/jctvc src/jctvc/TLibEncoder src/jctvc/TLibVideoIO \ + src/jctvc/TLibCommon src/jctvc/libmd5 + +clean: + rm -f $(PROGS) libbpgenc.so.0 libbpgdec.so.0 $(BPGENC_OBJS) $(LIBBPG_OBJS) $(JCTVC_OBJS) \ + src/*.o *.a src/*.d src/*~ $(addsuffix /*.o, $(CLEAN_DIRS)) \ + $(addsuffix /*.d, $(CLEAN_DIRS)) $(addsuffix /*~, $(CLEAN_DIRS)) \ + $(addsuffix /*.a, $(CLEAN_DIRS)) + +%.o: %.c + $(CC) $(CFLAGS) -c -o $@ $< + +%.o: %.cpp + $(CXX) $(CXXFLAGS) -c -o $@ $< + +%.js.o: %.c + $(EMCC) $(EMCFLAGS) -c -o $@ $< + +%.js8.o: %.c + $(EMCC) $(EMCFLAGS) -c -o $@ $< + +%.js8a.o: %.c + $(EMCC) $(EMCFLAGS) -c -o $@ $< + +-include $(wildcard src/*.d) +-include $(wildcard src/libavcodec/*.d) +-include $(wildcard src/libavutil/*.d) +-include $(wildcard src/jctvc/*.d) +-include $(wildcard src/jctvc/TLibEncoder/*.d) +-include $(wildcard src/jctvc/TLibVideoIO/*.d) +-include $(wildcard src/jctvc/TLibCommon/*.d) +-include $(wildcard src/jctvc/libmd5/*.d) diff --git a/bpgdec.c b/src/bpgdec.c similarity index 100% rename from bpgdec.c rename to src/bpgdec.c diff --git a/bpgenc.c b/src/bpgenc.c similarity index 100% rename from bpgenc.c rename to src/bpgenc.c diff --git a/bpgenc.h b/src/bpgenc.h similarity index 100% rename from bpgenc.h rename to src/bpgenc.h diff --git a/bpgview.c b/src/bpgview.c similarity index 100% rename from bpgview.c rename to src/bpgview.c diff --git a/config.h b/src/config.h similarity index 100% rename from config.h rename to src/config.h diff --git a/jctvc/Makefile b/src/jctvc/Makefile similarity index 96% rename from jctvc/Makefile rename to src/jctvc/Makefile index 16eb574b..436b244b 100644 --- a/jctvc/Makefile +++ b/src/jctvc/Makefile @@ -5,6 +5,10 @@ CFLAGS+=-D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE PWD:=$(shell pwd) CFLAGS+=-I$(PWD) +ifneq ($(shell uname -m), i386) + CFLAGS += -fPIC +endif + CXX=g++ CXXFLAGS=$(CFLAGS) diff --git a/jctvc/TAppEncCfg.cpp b/src/jctvc/TAppEncCfg.cpp similarity index 100% rename from jctvc/TAppEncCfg.cpp rename to src/jctvc/TAppEncCfg.cpp diff --git a/jctvc/TAppEncCfg.h b/src/jctvc/TAppEncCfg.h similarity index 100% rename from jctvc/TAppEncCfg.h rename to src/jctvc/TAppEncCfg.h diff --git a/jctvc/TAppEncTop.cpp b/src/jctvc/TAppEncTop.cpp similarity index 100% rename from jctvc/TAppEncTop.cpp rename to src/jctvc/TAppEncTop.cpp diff --git a/jctvc/TAppEncTop.h b/src/jctvc/TAppEncTop.h similarity index 100% rename from jctvc/TAppEncTop.h rename to src/jctvc/TAppEncTop.h diff --git a/jctvc/TLibCommon/AccessUnit.h b/src/jctvc/TLibCommon/AccessUnit.h similarity index 100% rename from jctvc/TLibCommon/AccessUnit.h rename to src/jctvc/TLibCommon/AccessUnit.h diff --git a/jctvc/TLibCommon/CommonDef.h b/src/jctvc/TLibCommon/CommonDef.h similarity index 100% rename from jctvc/TLibCommon/CommonDef.h rename to src/jctvc/TLibCommon/CommonDef.h diff --git a/jctvc/TLibCommon/ContextModel.cpp b/src/jctvc/TLibCommon/ContextModel.cpp similarity index 100% rename from jctvc/TLibCommon/ContextModel.cpp rename to src/jctvc/TLibCommon/ContextModel.cpp diff --git a/jctvc/TLibCommon/ContextModel.h b/src/jctvc/TLibCommon/ContextModel.h similarity index 100% rename from jctvc/TLibCommon/ContextModel.h rename to src/jctvc/TLibCommon/ContextModel.h diff --git a/jctvc/TLibCommon/ContextModel3DBuffer.cpp b/src/jctvc/TLibCommon/ContextModel3DBuffer.cpp similarity index 100% rename from jctvc/TLibCommon/ContextModel3DBuffer.cpp rename to src/jctvc/TLibCommon/ContextModel3DBuffer.cpp diff --git a/jctvc/TLibCommon/ContextModel3DBuffer.h b/src/jctvc/TLibCommon/ContextModel3DBuffer.h similarity index 100% rename from jctvc/TLibCommon/ContextModel3DBuffer.h rename to src/jctvc/TLibCommon/ContextModel3DBuffer.h diff --git a/jctvc/TLibCommon/ContextTables.h b/src/jctvc/TLibCommon/ContextTables.h similarity index 100% rename from jctvc/TLibCommon/ContextTables.h rename to src/jctvc/TLibCommon/ContextTables.h diff --git a/jctvc/TLibCommon/Debug.cpp b/src/jctvc/TLibCommon/Debug.cpp similarity index 100% rename from jctvc/TLibCommon/Debug.cpp rename to src/jctvc/TLibCommon/Debug.cpp diff --git a/jctvc/TLibCommon/Debug.h b/src/jctvc/TLibCommon/Debug.h similarity index 100% rename from jctvc/TLibCommon/Debug.h rename to src/jctvc/TLibCommon/Debug.h diff --git a/jctvc/TLibCommon/NAL.h b/src/jctvc/TLibCommon/NAL.h similarity index 100% rename from jctvc/TLibCommon/NAL.h rename to src/jctvc/TLibCommon/NAL.h diff --git a/jctvc/TLibCommon/SEI.cpp b/src/jctvc/TLibCommon/SEI.cpp similarity index 100% rename from jctvc/TLibCommon/SEI.cpp rename to src/jctvc/TLibCommon/SEI.cpp diff --git a/jctvc/TLibCommon/SEI.h b/src/jctvc/TLibCommon/SEI.h similarity index 100% rename from jctvc/TLibCommon/SEI.h rename to src/jctvc/TLibCommon/SEI.h diff --git a/jctvc/TLibCommon/TComBitCounter.h b/src/jctvc/TLibCommon/TComBitCounter.h similarity index 100% rename from jctvc/TLibCommon/TComBitCounter.h rename to src/jctvc/TLibCommon/TComBitCounter.h diff --git a/jctvc/TLibCommon/TComBitStream.cpp b/src/jctvc/TLibCommon/TComBitStream.cpp similarity index 100% rename from jctvc/TLibCommon/TComBitStream.cpp rename to src/jctvc/TLibCommon/TComBitStream.cpp diff --git a/jctvc/TLibCommon/TComBitStream.h b/src/jctvc/TLibCommon/TComBitStream.h similarity index 100% rename from jctvc/TLibCommon/TComBitStream.h rename to src/jctvc/TLibCommon/TComBitStream.h diff --git a/jctvc/TLibCommon/TComCABACTables.cpp b/src/jctvc/TLibCommon/TComCABACTables.cpp similarity index 100% rename from jctvc/TLibCommon/TComCABACTables.cpp rename to src/jctvc/TLibCommon/TComCABACTables.cpp diff --git a/jctvc/TLibCommon/TComCABACTables.h b/src/jctvc/TLibCommon/TComCABACTables.h similarity index 100% rename from jctvc/TLibCommon/TComCABACTables.h rename to src/jctvc/TLibCommon/TComCABACTables.h diff --git a/jctvc/TLibCommon/TComChromaFormat.cpp b/src/jctvc/TLibCommon/TComChromaFormat.cpp similarity index 100% rename from jctvc/TLibCommon/TComChromaFormat.cpp rename to src/jctvc/TLibCommon/TComChromaFormat.cpp diff --git a/jctvc/TLibCommon/TComChromaFormat.h b/src/jctvc/TLibCommon/TComChromaFormat.h similarity index 100% rename from jctvc/TLibCommon/TComChromaFormat.h rename to src/jctvc/TLibCommon/TComChromaFormat.h diff --git a/jctvc/TLibCommon/TComCodingStatistics.h b/src/jctvc/TLibCommon/TComCodingStatistics.h similarity index 100% rename from jctvc/TLibCommon/TComCodingStatistics.h rename to src/jctvc/TLibCommon/TComCodingStatistics.h diff --git a/jctvc/TLibCommon/TComDataCU.cpp b/src/jctvc/TLibCommon/TComDataCU.cpp similarity index 100% rename from jctvc/TLibCommon/TComDataCU.cpp rename to src/jctvc/TLibCommon/TComDataCU.cpp diff --git a/jctvc/TLibCommon/TComDataCU.h b/src/jctvc/TLibCommon/TComDataCU.h similarity index 100% rename from jctvc/TLibCommon/TComDataCU.h rename to src/jctvc/TLibCommon/TComDataCU.h diff --git a/jctvc/TLibCommon/TComInterpolationFilter.cpp b/src/jctvc/TLibCommon/TComInterpolationFilter.cpp similarity index 100% rename from jctvc/TLibCommon/TComInterpolationFilter.cpp rename to src/jctvc/TLibCommon/TComInterpolationFilter.cpp diff --git a/jctvc/TLibCommon/TComInterpolationFilter.h b/src/jctvc/TLibCommon/TComInterpolationFilter.h similarity index 100% rename from jctvc/TLibCommon/TComInterpolationFilter.h rename to src/jctvc/TLibCommon/TComInterpolationFilter.h diff --git a/jctvc/TLibCommon/TComList.h b/src/jctvc/TLibCommon/TComList.h similarity index 100% rename from jctvc/TLibCommon/TComList.h rename to src/jctvc/TLibCommon/TComList.h diff --git a/jctvc/TLibCommon/TComLoopFilter.cpp b/src/jctvc/TLibCommon/TComLoopFilter.cpp similarity index 100% rename from jctvc/TLibCommon/TComLoopFilter.cpp rename to src/jctvc/TLibCommon/TComLoopFilter.cpp diff --git a/jctvc/TLibCommon/TComLoopFilter.h b/src/jctvc/TLibCommon/TComLoopFilter.h similarity index 100% rename from jctvc/TLibCommon/TComLoopFilter.h rename to src/jctvc/TLibCommon/TComLoopFilter.h diff --git a/jctvc/TLibCommon/TComMotionInfo.cpp b/src/jctvc/TLibCommon/TComMotionInfo.cpp similarity index 100% rename from jctvc/TLibCommon/TComMotionInfo.cpp rename to src/jctvc/TLibCommon/TComMotionInfo.cpp diff --git a/jctvc/TLibCommon/TComMotionInfo.h b/src/jctvc/TLibCommon/TComMotionInfo.h similarity index 100% rename from jctvc/TLibCommon/TComMotionInfo.h rename to src/jctvc/TLibCommon/TComMotionInfo.h diff --git a/jctvc/TLibCommon/TComMv.h b/src/jctvc/TLibCommon/TComMv.h similarity index 100% rename from jctvc/TLibCommon/TComMv.h rename to src/jctvc/TLibCommon/TComMv.h diff --git a/jctvc/TLibCommon/TComPattern.cpp b/src/jctvc/TLibCommon/TComPattern.cpp similarity index 100% rename from jctvc/TLibCommon/TComPattern.cpp rename to src/jctvc/TLibCommon/TComPattern.cpp diff --git a/jctvc/TLibCommon/TComPattern.h b/src/jctvc/TLibCommon/TComPattern.h similarity index 100% rename from jctvc/TLibCommon/TComPattern.h rename to src/jctvc/TLibCommon/TComPattern.h diff --git a/jctvc/TLibCommon/TComPic.cpp b/src/jctvc/TLibCommon/TComPic.cpp similarity index 100% rename from jctvc/TLibCommon/TComPic.cpp rename to src/jctvc/TLibCommon/TComPic.cpp diff --git a/jctvc/TLibCommon/TComPic.h b/src/jctvc/TLibCommon/TComPic.h similarity index 100% rename from jctvc/TLibCommon/TComPic.h rename to src/jctvc/TLibCommon/TComPic.h diff --git a/jctvc/TLibCommon/TComPicSym.cpp b/src/jctvc/TLibCommon/TComPicSym.cpp similarity index 100% rename from jctvc/TLibCommon/TComPicSym.cpp rename to src/jctvc/TLibCommon/TComPicSym.cpp diff --git a/jctvc/TLibCommon/TComPicSym.h b/src/jctvc/TLibCommon/TComPicSym.h similarity index 100% rename from jctvc/TLibCommon/TComPicSym.h rename to src/jctvc/TLibCommon/TComPicSym.h diff --git a/jctvc/TLibCommon/TComPicYuv.cpp b/src/jctvc/TLibCommon/TComPicYuv.cpp similarity index 100% rename from jctvc/TLibCommon/TComPicYuv.cpp rename to src/jctvc/TLibCommon/TComPicYuv.cpp diff --git a/jctvc/TLibCommon/TComPicYuv.h b/src/jctvc/TLibCommon/TComPicYuv.h similarity index 100% rename from jctvc/TLibCommon/TComPicYuv.h rename to src/jctvc/TLibCommon/TComPicYuv.h diff --git a/jctvc/TLibCommon/TComPicYuvMD5.cpp b/src/jctvc/TLibCommon/TComPicYuvMD5.cpp similarity index 100% rename from jctvc/TLibCommon/TComPicYuvMD5.cpp rename to src/jctvc/TLibCommon/TComPicYuvMD5.cpp diff --git a/jctvc/TLibCommon/TComPrediction.cpp b/src/jctvc/TLibCommon/TComPrediction.cpp similarity index 100% rename from jctvc/TLibCommon/TComPrediction.cpp rename to src/jctvc/TLibCommon/TComPrediction.cpp diff --git a/jctvc/TLibCommon/TComPrediction.h b/src/jctvc/TLibCommon/TComPrediction.h similarity index 100% rename from jctvc/TLibCommon/TComPrediction.h rename to src/jctvc/TLibCommon/TComPrediction.h diff --git a/jctvc/TLibCommon/TComRdCost.cpp b/src/jctvc/TLibCommon/TComRdCost.cpp similarity index 100% rename from jctvc/TLibCommon/TComRdCost.cpp rename to src/jctvc/TLibCommon/TComRdCost.cpp diff --git a/jctvc/TLibCommon/TComRdCost.h b/src/jctvc/TLibCommon/TComRdCost.h similarity index 100% rename from jctvc/TLibCommon/TComRdCost.h rename to src/jctvc/TLibCommon/TComRdCost.h diff --git a/jctvc/TLibCommon/TComRdCostWeightPrediction.cpp b/src/jctvc/TLibCommon/TComRdCostWeightPrediction.cpp similarity index 100% rename from jctvc/TLibCommon/TComRdCostWeightPrediction.cpp rename to src/jctvc/TLibCommon/TComRdCostWeightPrediction.cpp diff --git a/jctvc/TLibCommon/TComRdCostWeightPrediction.h b/src/jctvc/TLibCommon/TComRdCostWeightPrediction.h similarity index 100% rename from jctvc/TLibCommon/TComRdCostWeightPrediction.h rename to src/jctvc/TLibCommon/TComRdCostWeightPrediction.h diff --git a/jctvc/TLibCommon/TComRectangle.h b/src/jctvc/TLibCommon/TComRectangle.h similarity index 100% rename from jctvc/TLibCommon/TComRectangle.h rename to src/jctvc/TLibCommon/TComRectangle.h diff --git a/jctvc/TLibCommon/TComRom.cpp b/src/jctvc/TLibCommon/TComRom.cpp similarity index 100% rename from jctvc/TLibCommon/TComRom.cpp rename to src/jctvc/TLibCommon/TComRom.cpp diff --git a/jctvc/TLibCommon/TComRom.h b/src/jctvc/TLibCommon/TComRom.h similarity index 100% rename from jctvc/TLibCommon/TComRom.h rename to src/jctvc/TLibCommon/TComRom.h diff --git a/jctvc/TLibCommon/TComSampleAdaptiveOffset.cpp b/src/jctvc/TLibCommon/TComSampleAdaptiveOffset.cpp similarity index 100% rename from jctvc/TLibCommon/TComSampleAdaptiveOffset.cpp rename to src/jctvc/TLibCommon/TComSampleAdaptiveOffset.cpp diff --git a/jctvc/TLibCommon/TComSampleAdaptiveOffset.h b/src/jctvc/TLibCommon/TComSampleAdaptiveOffset.h similarity index 100% rename from jctvc/TLibCommon/TComSampleAdaptiveOffset.h rename to src/jctvc/TLibCommon/TComSampleAdaptiveOffset.h diff --git a/jctvc/TLibCommon/TComSlice.cpp b/src/jctvc/TLibCommon/TComSlice.cpp similarity index 100% rename from jctvc/TLibCommon/TComSlice.cpp rename to src/jctvc/TLibCommon/TComSlice.cpp diff --git a/jctvc/TLibCommon/TComSlice.h b/src/jctvc/TLibCommon/TComSlice.h similarity index 100% rename from jctvc/TLibCommon/TComSlice.h rename to src/jctvc/TLibCommon/TComSlice.h diff --git a/jctvc/TLibCommon/TComTU.cpp b/src/jctvc/TLibCommon/TComTU.cpp similarity index 100% rename from jctvc/TLibCommon/TComTU.cpp rename to src/jctvc/TLibCommon/TComTU.cpp diff --git a/jctvc/TLibCommon/TComTU.h b/src/jctvc/TLibCommon/TComTU.h similarity index 100% rename from jctvc/TLibCommon/TComTU.h rename to src/jctvc/TLibCommon/TComTU.h diff --git a/jctvc/TLibCommon/TComTrQuant.cpp b/src/jctvc/TLibCommon/TComTrQuant.cpp similarity index 100% rename from jctvc/TLibCommon/TComTrQuant.cpp rename to src/jctvc/TLibCommon/TComTrQuant.cpp diff --git a/jctvc/TLibCommon/TComTrQuant.h b/src/jctvc/TLibCommon/TComTrQuant.h similarity index 100% rename from jctvc/TLibCommon/TComTrQuant.h rename to src/jctvc/TLibCommon/TComTrQuant.h diff --git a/jctvc/TLibCommon/TComWeightPrediction.cpp b/src/jctvc/TLibCommon/TComWeightPrediction.cpp similarity index 100% rename from jctvc/TLibCommon/TComWeightPrediction.cpp rename to src/jctvc/TLibCommon/TComWeightPrediction.cpp diff --git a/jctvc/TLibCommon/TComWeightPrediction.h b/src/jctvc/TLibCommon/TComWeightPrediction.h similarity index 100% rename from jctvc/TLibCommon/TComWeightPrediction.h rename to src/jctvc/TLibCommon/TComWeightPrediction.h diff --git a/jctvc/TLibCommon/TComYuv.cpp b/src/jctvc/TLibCommon/TComYuv.cpp similarity index 100% rename from jctvc/TLibCommon/TComYuv.cpp rename to src/jctvc/TLibCommon/TComYuv.cpp diff --git a/jctvc/TLibCommon/TComYuv.h b/src/jctvc/TLibCommon/TComYuv.h similarity index 100% rename from jctvc/TLibCommon/TComYuv.h rename to src/jctvc/TLibCommon/TComYuv.h diff --git a/jctvc/TLibCommon/TypeDef.h b/src/jctvc/TLibCommon/TypeDef.h similarity index 100% rename from jctvc/TLibCommon/TypeDef.h rename to src/jctvc/TLibCommon/TypeDef.h diff --git a/jctvc/TLibEncoder/AnnexBwrite.h b/src/jctvc/TLibEncoder/AnnexBwrite.h similarity index 100% rename from jctvc/TLibEncoder/AnnexBwrite.h rename to src/jctvc/TLibEncoder/AnnexBwrite.h diff --git a/jctvc/TLibEncoder/NALwrite.cpp b/src/jctvc/TLibEncoder/NALwrite.cpp similarity index 100% rename from jctvc/TLibEncoder/NALwrite.cpp rename to src/jctvc/TLibEncoder/NALwrite.cpp diff --git a/jctvc/TLibEncoder/NALwrite.h b/src/jctvc/TLibEncoder/NALwrite.h similarity index 100% rename from jctvc/TLibEncoder/NALwrite.h rename to src/jctvc/TLibEncoder/NALwrite.h diff --git a/jctvc/TLibEncoder/SEIwrite.cpp b/src/jctvc/TLibEncoder/SEIwrite.cpp similarity index 100% rename from jctvc/TLibEncoder/SEIwrite.cpp rename to src/jctvc/TLibEncoder/SEIwrite.cpp diff --git a/jctvc/TLibEncoder/SEIwrite.h b/src/jctvc/TLibEncoder/SEIwrite.h similarity index 100% rename from jctvc/TLibEncoder/SEIwrite.h rename to src/jctvc/TLibEncoder/SEIwrite.h diff --git a/jctvc/TLibEncoder/SyntaxElementWriter.cpp b/src/jctvc/TLibEncoder/SyntaxElementWriter.cpp similarity index 100% rename from jctvc/TLibEncoder/SyntaxElementWriter.cpp rename to src/jctvc/TLibEncoder/SyntaxElementWriter.cpp diff --git a/jctvc/TLibEncoder/SyntaxElementWriter.h b/src/jctvc/TLibEncoder/SyntaxElementWriter.h similarity index 100% rename from jctvc/TLibEncoder/SyntaxElementWriter.h rename to src/jctvc/TLibEncoder/SyntaxElementWriter.h diff --git a/jctvc/TLibEncoder/TEncAnalyze.cpp b/src/jctvc/TLibEncoder/TEncAnalyze.cpp similarity index 100% rename from jctvc/TLibEncoder/TEncAnalyze.cpp rename to src/jctvc/TLibEncoder/TEncAnalyze.cpp diff --git a/jctvc/TLibEncoder/TEncAnalyze.h b/src/jctvc/TLibEncoder/TEncAnalyze.h similarity index 100% rename from jctvc/TLibEncoder/TEncAnalyze.h rename to src/jctvc/TLibEncoder/TEncAnalyze.h diff --git a/jctvc/TLibEncoder/TEncBinCoder.h b/src/jctvc/TLibEncoder/TEncBinCoder.h similarity index 100% rename from jctvc/TLibEncoder/TEncBinCoder.h rename to src/jctvc/TLibEncoder/TEncBinCoder.h diff --git a/jctvc/TLibEncoder/TEncBinCoderCABAC.cpp b/src/jctvc/TLibEncoder/TEncBinCoderCABAC.cpp similarity index 100% rename from jctvc/TLibEncoder/TEncBinCoderCABAC.cpp rename to src/jctvc/TLibEncoder/TEncBinCoderCABAC.cpp diff --git a/jctvc/TLibEncoder/TEncBinCoderCABAC.h b/src/jctvc/TLibEncoder/TEncBinCoderCABAC.h similarity index 100% rename from jctvc/TLibEncoder/TEncBinCoderCABAC.h rename to src/jctvc/TLibEncoder/TEncBinCoderCABAC.h diff --git a/jctvc/TLibEncoder/TEncBinCoderCABACCounter.cpp b/src/jctvc/TLibEncoder/TEncBinCoderCABACCounter.cpp similarity index 100% rename from jctvc/TLibEncoder/TEncBinCoderCABACCounter.cpp rename to src/jctvc/TLibEncoder/TEncBinCoderCABACCounter.cpp diff --git a/jctvc/TLibEncoder/TEncBinCoderCABACCounter.h b/src/jctvc/TLibEncoder/TEncBinCoderCABACCounter.h similarity index 100% rename from jctvc/TLibEncoder/TEncBinCoderCABACCounter.h rename to src/jctvc/TLibEncoder/TEncBinCoderCABACCounter.h diff --git a/jctvc/TLibEncoder/TEncCavlc.cpp b/src/jctvc/TLibEncoder/TEncCavlc.cpp similarity index 100% rename from jctvc/TLibEncoder/TEncCavlc.cpp rename to src/jctvc/TLibEncoder/TEncCavlc.cpp diff --git a/jctvc/TLibEncoder/TEncCavlc.h b/src/jctvc/TLibEncoder/TEncCavlc.h similarity index 100% rename from jctvc/TLibEncoder/TEncCavlc.h rename to src/jctvc/TLibEncoder/TEncCavlc.h diff --git a/jctvc/TLibEncoder/TEncCfg.h b/src/jctvc/TLibEncoder/TEncCfg.h similarity index 100% rename from jctvc/TLibEncoder/TEncCfg.h rename to src/jctvc/TLibEncoder/TEncCfg.h diff --git a/jctvc/TLibEncoder/TEncCu.cpp b/src/jctvc/TLibEncoder/TEncCu.cpp similarity index 100% rename from jctvc/TLibEncoder/TEncCu.cpp rename to src/jctvc/TLibEncoder/TEncCu.cpp diff --git a/jctvc/TLibEncoder/TEncCu.h b/src/jctvc/TLibEncoder/TEncCu.h similarity index 100% rename from jctvc/TLibEncoder/TEncCu.h rename to src/jctvc/TLibEncoder/TEncCu.h diff --git a/jctvc/TLibEncoder/TEncEntropy.cpp b/src/jctvc/TLibEncoder/TEncEntropy.cpp similarity index 100% rename from jctvc/TLibEncoder/TEncEntropy.cpp rename to src/jctvc/TLibEncoder/TEncEntropy.cpp diff --git a/jctvc/TLibEncoder/TEncEntropy.h b/src/jctvc/TLibEncoder/TEncEntropy.h similarity index 100% rename from jctvc/TLibEncoder/TEncEntropy.h rename to src/jctvc/TLibEncoder/TEncEntropy.h diff --git a/jctvc/TLibEncoder/TEncGOP.cpp b/src/jctvc/TLibEncoder/TEncGOP.cpp similarity index 100% rename from jctvc/TLibEncoder/TEncGOP.cpp rename to src/jctvc/TLibEncoder/TEncGOP.cpp diff --git a/jctvc/TLibEncoder/TEncGOP.h b/src/jctvc/TLibEncoder/TEncGOP.h similarity index 100% rename from jctvc/TLibEncoder/TEncGOP.h rename to src/jctvc/TLibEncoder/TEncGOP.h diff --git a/jctvc/TLibEncoder/TEncPic.cpp b/src/jctvc/TLibEncoder/TEncPic.cpp similarity index 100% rename from jctvc/TLibEncoder/TEncPic.cpp rename to src/jctvc/TLibEncoder/TEncPic.cpp diff --git a/jctvc/TLibEncoder/TEncPic.h b/src/jctvc/TLibEncoder/TEncPic.h similarity index 100% rename from jctvc/TLibEncoder/TEncPic.h rename to src/jctvc/TLibEncoder/TEncPic.h diff --git a/jctvc/TLibEncoder/TEncPreanalyzer.cpp b/src/jctvc/TLibEncoder/TEncPreanalyzer.cpp similarity index 100% rename from jctvc/TLibEncoder/TEncPreanalyzer.cpp rename to src/jctvc/TLibEncoder/TEncPreanalyzer.cpp diff --git a/jctvc/TLibEncoder/TEncPreanalyzer.h b/src/jctvc/TLibEncoder/TEncPreanalyzer.h similarity index 100% rename from jctvc/TLibEncoder/TEncPreanalyzer.h rename to src/jctvc/TLibEncoder/TEncPreanalyzer.h diff --git a/jctvc/TLibEncoder/TEncRateCtrl.cpp b/src/jctvc/TLibEncoder/TEncRateCtrl.cpp similarity index 100% rename from jctvc/TLibEncoder/TEncRateCtrl.cpp rename to src/jctvc/TLibEncoder/TEncRateCtrl.cpp diff --git a/jctvc/TLibEncoder/TEncRateCtrl.h b/src/jctvc/TLibEncoder/TEncRateCtrl.h similarity index 100% rename from jctvc/TLibEncoder/TEncRateCtrl.h rename to src/jctvc/TLibEncoder/TEncRateCtrl.h diff --git a/jctvc/TLibEncoder/TEncSampleAdaptiveOffset.cpp b/src/jctvc/TLibEncoder/TEncSampleAdaptiveOffset.cpp similarity index 100% rename from jctvc/TLibEncoder/TEncSampleAdaptiveOffset.cpp rename to src/jctvc/TLibEncoder/TEncSampleAdaptiveOffset.cpp diff --git a/jctvc/TLibEncoder/TEncSampleAdaptiveOffset.h b/src/jctvc/TLibEncoder/TEncSampleAdaptiveOffset.h similarity index 100% rename from jctvc/TLibEncoder/TEncSampleAdaptiveOffset.h rename to src/jctvc/TLibEncoder/TEncSampleAdaptiveOffset.h diff --git a/jctvc/TLibEncoder/TEncSbac.cpp b/src/jctvc/TLibEncoder/TEncSbac.cpp similarity index 100% rename from jctvc/TLibEncoder/TEncSbac.cpp rename to src/jctvc/TLibEncoder/TEncSbac.cpp diff --git a/jctvc/TLibEncoder/TEncSbac.h b/src/jctvc/TLibEncoder/TEncSbac.h similarity index 100% rename from jctvc/TLibEncoder/TEncSbac.h rename to src/jctvc/TLibEncoder/TEncSbac.h diff --git a/jctvc/TLibEncoder/TEncSearch.cpp b/src/jctvc/TLibEncoder/TEncSearch.cpp similarity index 100% rename from jctvc/TLibEncoder/TEncSearch.cpp rename to src/jctvc/TLibEncoder/TEncSearch.cpp diff --git a/jctvc/TLibEncoder/TEncSearch.h b/src/jctvc/TLibEncoder/TEncSearch.h similarity index 100% rename from jctvc/TLibEncoder/TEncSearch.h rename to src/jctvc/TLibEncoder/TEncSearch.h diff --git a/jctvc/TLibEncoder/TEncSlice.cpp b/src/jctvc/TLibEncoder/TEncSlice.cpp similarity index 100% rename from jctvc/TLibEncoder/TEncSlice.cpp rename to src/jctvc/TLibEncoder/TEncSlice.cpp diff --git a/jctvc/TLibEncoder/TEncSlice.h b/src/jctvc/TLibEncoder/TEncSlice.h similarity index 100% rename from jctvc/TLibEncoder/TEncSlice.h rename to src/jctvc/TLibEncoder/TEncSlice.h diff --git a/jctvc/TLibEncoder/TEncTop.cpp b/src/jctvc/TLibEncoder/TEncTop.cpp similarity index 100% rename from jctvc/TLibEncoder/TEncTop.cpp rename to src/jctvc/TLibEncoder/TEncTop.cpp diff --git a/jctvc/TLibEncoder/TEncTop.h b/src/jctvc/TLibEncoder/TEncTop.h similarity index 100% rename from jctvc/TLibEncoder/TEncTop.h rename to src/jctvc/TLibEncoder/TEncTop.h diff --git a/jctvc/TLibEncoder/WeightPredAnalysis.cpp b/src/jctvc/TLibEncoder/WeightPredAnalysis.cpp similarity index 100% rename from jctvc/TLibEncoder/WeightPredAnalysis.cpp rename to src/jctvc/TLibEncoder/WeightPredAnalysis.cpp diff --git a/jctvc/TLibEncoder/WeightPredAnalysis.h b/src/jctvc/TLibEncoder/WeightPredAnalysis.h similarity index 100% rename from jctvc/TLibEncoder/WeightPredAnalysis.h rename to src/jctvc/TLibEncoder/WeightPredAnalysis.h diff --git a/jctvc/TLibVideoIO/TVideoIOYuv.cpp b/src/jctvc/TLibVideoIO/TVideoIOYuv.cpp similarity index 100% rename from jctvc/TLibVideoIO/TVideoIOYuv.cpp rename to src/jctvc/TLibVideoIO/TVideoIOYuv.cpp diff --git a/jctvc/TLibVideoIO/TVideoIOYuv.h b/src/jctvc/TLibVideoIO/TVideoIOYuv.h similarity index 100% rename from jctvc/TLibVideoIO/TVideoIOYuv.h rename to src/jctvc/TLibVideoIO/TVideoIOYuv.h diff --git a/jctvc/encmain.cpp b/src/jctvc/encmain.cpp similarity index 100% rename from jctvc/encmain.cpp rename to src/jctvc/encmain.cpp diff --git a/jctvc/encoder_intra_main.cfg b/src/jctvc/encoder_intra_main.cfg similarity index 100% rename from jctvc/encoder_intra_main.cfg rename to src/jctvc/encoder_intra_main.cfg diff --git a/jctvc/libmd5/MD5.h b/src/jctvc/libmd5/MD5.h similarity index 100% rename from jctvc/libmd5/MD5.h rename to src/jctvc/libmd5/MD5.h diff --git a/jctvc/libmd5/libmd5.c b/src/jctvc/libmd5/libmd5.c similarity index 100% rename from jctvc/libmd5/libmd5.c rename to src/jctvc/libmd5/libmd5.c diff --git a/jctvc/libmd5/libmd5.h b/src/jctvc/libmd5/libmd5.h similarity index 100% rename from jctvc/libmd5/libmd5.h rename to src/jctvc/libmd5/libmd5.h diff --git a/jctvc/program_options_lite.cpp b/src/jctvc/program_options_lite.cpp similarity index 100% rename from jctvc/program_options_lite.cpp rename to src/jctvc/program_options_lite.cpp diff --git a/jctvc/program_options_lite.h b/src/jctvc/program_options_lite.h similarity index 100% rename from jctvc/program_options_lite.h rename to src/jctvc/program_options_lite.h diff --git a/jctvc_glue.cpp b/src/jctvc_glue.cpp similarity index 100% rename from jctvc_glue.cpp rename to src/jctvc_glue.cpp diff --git a/libavcodec/avcodec.h b/src/libavcodec/avcodec.h similarity index 100% rename from libavcodec/avcodec.h rename to src/libavcodec/avcodec.h diff --git a/libavcodec/bit_depth_template.c b/src/libavcodec/bit_depth_template.c similarity index 100% rename from libavcodec/bit_depth_template.c rename to src/libavcodec/bit_depth_template.c diff --git a/libavcodec/bswapdsp.h b/src/libavcodec/bswapdsp.h similarity index 100% rename from libavcodec/bswapdsp.h rename to src/libavcodec/bswapdsp.h diff --git a/libavcodec/bytestream.h b/src/libavcodec/bytestream.h similarity index 100% rename from libavcodec/bytestream.h rename to src/libavcodec/bytestream.h diff --git a/libavcodec/cabac.c b/src/libavcodec/cabac.c similarity index 100% rename from libavcodec/cabac.c rename to src/libavcodec/cabac.c diff --git a/libavcodec/cabac.h b/src/libavcodec/cabac.h similarity index 100% rename from libavcodec/cabac.h rename to src/libavcodec/cabac.h diff --git a/libavcodec/cabac_functions.h b/src/libavcodec/cabac_functions.h similarity index 100% rename from libavcodec/cabac_functions.h rename to src/libavcodec/cabac_functions.h diff --git a/libavcodec/cabac_tablegen.h b/src/libavcodec/cabac_tablegen.h similarity index 100% rename from libavcodec/cabac_tablegen.h rename to src/libavcodec/cabac_tablegen.h diff --git a/libavcodec/get_bits.h b/src/libavcodec/get_bits.h similarity index 100% rename from libavcodec/get_bits.h rename to src/libavcodec/get_bits.h diff --git a/libavcodec/golomb.c b/src/libavcodec/golomb.c similarity index 100% rename from libavcodec/golomb.c rename to src/libavcodec/golomb.c diff --git a/libavcodec/golomb.h b/src/libavcodec/golomb.h similarity index 100% rename from libavcodec/golomb.h rename to src/libavcodec/golomb.h diff --git a/libavcodec/hevc.c b/src/libavcodec/hevc.c similarity index 100% rename from libavcodec/hevc.c rename to src/libavcodec/hevc.c diff --git a/libavcodec/hevc.h b/src/libavcodec/hevc.h similarity index 100% rename from libavcodec/hevc.h rename to src/libavcodec/hevc.h diff --git a/libavcodec/hevc_cabac.c b/src/libavcodec/hevc_cabac.c similarity index 100% rename from libavcodec/hevc_cabac.c rename to src/libavcodec/hevc_cabac.c diff --git a/libavcodec/hevc_filter.c b/src/libavcodec/hevc_filter.c similarity index 100% rename from libavcodec/hevc_filter.c rename to src/libavcodec/hevc_filter.c diff --git a/libavcodec/hevc_mvs.c b/src/libavcodec/hevc_mvs.c similarity index 100% rename from libavcodec/hevc_mvs.c rename to src/libavcodec/hevc_mvs.c diff --git a/libavcodec/hevc_ps.c b/src/libavcodec/hevc_ps.c similarity index 100% rename from libavcodec/hevc_ps.c rename to src/libavcodec/hevc_ps.c diff --git a/libavcodec/hevc_refs.c b/src/libavcodec/hevc_refs.c similarity index 100% rename from libavcodec/hevc_refs.c rename to src/libavcodec/hevc_refs.c diff --git a/libavcodec/hevc_sei.c b/src/libavcodec/hevc_sei.c similarity index 100% rename from libavcodec/hevc_sei.c rename to src/libavcodec/hevc_sei.c diff --git a/libavcodec/hevcdsp.c b/src/libavcodec/hevcdsp.c similarity index 100% rename from libavcodec/hevcdsp.c rename to src/libavcodec/hevcdsp.c diff --git a/libavcodec/hevcdsp.h b/src/libavcodec/hevcdsp.h similarity index 100% rename from libavcodec/hevcdsp.h rename to src/libavcodec/hevcdsp.h diff --git a/libavcodec/hevcdsp_template.c b/src/libavcodec/hevcdsp_template.c similarity index 100% rename from libavcodec/hevcdsp_template.c rename to src/libavcodec/hevcdsp_template.c diff --git a/libavcodec/hevcpred.c b/src/libavcodec/hevcpred.c similarity index 100% rename from libavcodec/hevcpred.c rename to src/libavcodec/hevcpred.c diff --git a/libavcodec/hevcpred.h b/src/libavcodec/hevcpred.h similarity index 100% rename from libavcodec/hevcpred.h rename to src/libavcodec/hevcpred.h diff --git a/libavcodec/hevcpred_template.c b/src/libavcodec/hevcpred_template.c similarity index 100% rename from libavcodec/hevcpred_template.c rename to src/libavcodec/hevcpred_template.c diff --git a/libavcodec/internal.h b/src/libavcodec/internal.h similarity index 100% rename from libavcodec/internal.h rename to src/libavcodec/internal.h diff --git a/libavcodec/mathops.h b/src/libavcodec/mathops.h similarity index 100% rename from libavcodec/mathops.h rename to src/libavcodec/mathops.h diff --git a/libavcodec/old_codec_ids.h b/src/libavcodec/old_codec_ids.h similarity index 100% rename from libavcodec/old_codec_ids.h rename to src/libavcodec/old_codec_ids.h diff --git a/libavcodec/put_bits.h b/src/libavcodec/put_bits.h similarity index 100% rename from libavcodec/put_bits.h rename to src/libavcodec/put_bits.h diff --git a/libavcodec/rnd_avg.h b/src/libavcodec/rnd_avg.h similarity index 100% rename from libavcodec/rnd_avg.h rename to src/libavcodec/rnd_avg.h diff --git a/libavcodec/thread.h b/src/libavcodec/thread.h similarity index 100% rename from libavcodec/thread.h rename to src/libavcodec/thread.h diff --git a/libavcodec/utils.c b/src/libavcodec/utils.c similarity index 100% rename from libavcodec/utils.c rename to src/libavcodec/utils.c diff --git a/libavcodec/version.h b/src/libavcodec/version.h similarity index 100% rename from libavcodec/version.h rename to src/libavcodec/version.h diff --git a/libavcodec/videodsp.c b/src/libavcodec/videodsp.c similarity index 100% rename from libavcodec/videodsp.c rename to src/libavcodec/videodsp.c diff --git a/libavcodec/videodsp.h b/src/libavcodec/videodsp.h similarity index 100% rename from libavcodec/videodsp.h rename to src/libavcodec/videodsp.h diff --git a/libavcodec/videodsp_template.c b/src/libavcodec/videodsp_template.c similarity index 100% rename from libavcodec/videodsp_template.c rename to src/libavcodec/videodsp_template.c diff --git a/libavutil/adler32.h b/src/libavutil/adler32.h similarity index 100% rename from libavutil/adler32.h rename to src/libavutil/adler32.h diff --git a/libavutil/aes.h b/src/libavutil/aes.h similarity index 100% rename from libavutil/aes.h rename to src/libavutil/aes.h diff --git a/libavutil/atomic.h b/src/libavutil/atomic.h similarity index 100% rename from libavutil/atomic.h rename to src/libavutil/atomic.h diff --git a/libavutil/atomic_gcc.h b/src/libavutil/atomic_gcc.h similarity index 100% rename from libavutil/atomic_gcc.h rename to src/libavutil/atomic_gcc.h diff --git a/libavutil/atomic_suncc.h b/src/libavutil/atomic_suncc.h similarity index 100% rename from libavutil/atomic_suncc.h rename to src/libavutil/atomic_suncc.h diff --git a/libavutil/atomic_win32.h b/src/libavutil/atomic_win32.h similarity index 100% rename from libavutil/atomic_win32.h rename to src/libavutil/atomic_win32.h diff --git a/libavutil/attributes.h b/src/libavutil/attributes.h similarity index 100% rename from libavutil/attributes.h rename to src/libavutil/attributes.h diff --git a/libavutil/audio_fifo.h b/src/libavutil/audio_fifo.h similarity index 100% rename from libavutil/audio_fifo.h rename to src/libavutil/audio_fifo.h diff --git a/libavutil/audioconvert.h b/src/libavutil/audioconvert.h similarity index 100% rename from libavutil/audioconvert.h rename to src/libavutil/audioconvert.h diff --git a/libavutil/avassert.h b/src/libavutil/avassert.h similarity index 100% rename from libavutil/avassert.h rename to src/libavutil/avassert.h diff --git a/libavutil/avconfig.h b/src/libavutil/avconfig.h similarity index 100% rename from libavutil/avconfig.h rename to src/libavutil/avconfig.h diff --git a/libavutil/avstring.h b/src/libavutil/avstring.h similarity index 100% rename from libavutil/avstring.h rename to src/libavutil/avstring.h diff --git a/libavutil/avutil.h b/src/libavutil/avutil.h similarity index 100% rename from libavutil/avutil.h rename to src/libavutil/avutil.h diff --git a/libavutil/base64.h b/src/libavutil/base64.h similarity index 100% rename from libavutil/base64.h rename to src/libavutil/base64.h diff --git a/libavutil/blowfish.h b/src/libavutil/blowfish.h similarity index 100% rename from libavutil/blowfish.h rename to src/libavutil/blowfish.h diff --git a/libavutil/bprint.h b/src/libavutil/bprint.h similarity index 100% rename from libavutil/bprint.h rename to src/libavutil/bprint.h diff --git a/libavutil/bswap.h b/src/libavutil/bswap.h similarity index 100% rename from libavutil/bswap.h rename to src/libavutil/bswap.h diff --git a/libavutil/buffer.c b/src/libavutil/buffer.c similarity index 100% rename from libavutil/buffer.c rename to src/libavutil/buffer.c diff --git a/libavutil/buffer.h b/src/libavutil/buffer.h similarity index 100% rename from libavutil/buffer.h rename to src/libavutil/buffer.h diff --git a/libavutil/buffer_internal.h b/src/libavutil/buffer_internal.h similarity index 100% rename from libavutil/buffer_internal.h rename to src/libavutil/buffer_internal.h diff --git a/libavutil/cast5.h b/src/libavutil/cast5.h similarity index 100% rename from libavutil/cast5.h rename to src/libavutil/cast5.h diff --git a/libavutil/channel_layout.h b/src/libavutil/channel_layout.h similarity index 100% rename from libavutil/channel_layout.h rename to src/libavutil/channel_layout.h diff --git a/libavutil/colorspace.h b/src/libavutil/colorspace.h similarity index 100% rename from libavutil/colorspace.h rename to src/libavutil/colorspace.h diff --git a/libavutil/common.h b/src/libavutil/common.h similarity index 100% rename from libavutil/common.h rename to src/libavutil/common.h diff --git a/libavutil/cpu.h b/src/libavutil/cpu.h similarity index 100% rename from libavutil/cpu.h rename to src/libavutil/cpu.h diff --git a/libavutil/cpu_internal.h b/src/libavutil/cpu_internal.h similarity index 100% rename from libavutil/cpu_internal.h rename to src/libavutil/cpu_internal.h diff --git a/libavutil/crc.h b/src/libavutil/crc.h similarity index 100% rename from libavutil/crc.h rename to src/libavutil/crc.h diff --git a/libavutil/des.h b/src/libavutil/des.h similarity index 100% rename from libavutil/des.h rename to src/libavutil/des.h diff --git a/libavutil/dict.h b/src/libavutil/dict.h similarity index 100% rename from libavutil/dict.h rename to src/libavutil/dict.h diff --git a/libavutil/display.h b/src/libavutil/display.h similarity index 100% rename from libavutil/display.h rename to src/libavutil/display.h diff --git a/libavutil/downmix_info.h b/src/libavutil/downmix_info.h similarity index 100% rename from libavutil/downmix_info.h rename to src/libavutil/downmix_info.h diff --git a/libavutil/dynarray.h b/src/libavutil/dynarray.h similarity index 100% rename from libavutil/dynarray.h rename to src/libavutil/dynarray.h diff --git a/libavutil/error.h b/src/libavutil/error.h similarity index 100% rename from libavutil/error.h rename to src/libavutil/error.h diff --git a/libavutil/eval.h b/src/libavutil/eval.h similarity index 100% rename from libavutil/eval.h rename to src/libavutil/eval.h diff --git a/libavutil/ffversion.h b/src/libavutil/ffversion.h similarity index 100% rename from libavutil/ffversion.h rename to src/libavutil/ffversion.h diff --git a/libavutil/fifo.h b/src/libavutil/fifo.h similarity index 100% rename from libavutil/fifo.h rename to src/libavutil/fifo.h diff --git a/libavutil/file.h b/src/libavutil/file.h similarity index 100% rename from libavutil/file.h rename to src/libavutil/file.h diff --git a/libavutil/fixed_dsp.h b/src/libavutil/fixed_dsp.h similarity index 100% rename from libavutil/fixed_dsp.h rename to src/libavutil/fixed_dsp.h diff --git a/libavutil/float_dsp.h b/src/libavutil/float_dsp.h similarity index 100% rename from libavutil/float_dsp.h rename to src/libavutil/float_dsp.h diff --git a/libavutil/frame.c b/src/libavutil/frame.c similarity index 100% rename from libavutil/frame.c rename to src/libavutil/frame.c diff --git a/libavutil/frame.h b/src/libavutil/frame.h similarity index 100% rename from libavutil/frame.h rename to src/libavutil/frame.h diff --git a/libavutil/hash.h b/src/libavutil/hash.h similarity index 100% rename from libavutil/hash.h rename to src/libavutil/hash.h diff --git a/libavutil/hmac.h b/src/libavutil/hmac.h similarity index 100% rename from libavutil/hmac.h rename to src/libavutil/hmac.h diff --git a/libavutil/imgutils.h b/src/libavutil/imgutils.h similarity index 100% rename from libavutil/imgutils.h rename to src/libavutil/imgutils.h diff --git a/libavutil/integer.h b/src/libavutil/integer.h similarity index 100% rename from libavutil/integer.h rename to src/libavutil/integer.h diff --git a/libavutil/internal.h b/src/libavutil/internal.h similarity index 100% rename from libavutil/internal.h rename to src/libavutil/internal.h diff --git a/libavutil/intfloat.h b/src/libavutil/intfloat.h similarity index 100% rename from libavutil/intfloat.h rename to src/libavutil/intfloat.h diff --git a/libavutil/intmath.h b/src/libavutil/intmath.h similarity index 100% rename from libavutil/intmath.h rename to src/libavutil/intmath.h diff --git a/libavutil/intreadwrite.h b/src/libavutil/intreadwrite.h similarity index 100% rename from libavutil/intreadwrite.h rename to src/libavutil/intreadwrite.h diff --git a/libavutil/lfg.h b/src/libavutil/lfg.h similarity index 100% rename from libavutil/lfg.h rename to src/libavutil/lfg.h diff --git a/libavutil/libm.h b/src/libavutil/libm.h similarity index 100% rename from libavutil/libm.h rename to src/libavutil/libm.h diff --git a/libavutil/lls.h b/src/libavutil/lls.h similarity index 100% rename from libavutil/lls.h rename to src/libavutil/lls.h diff --git a/libavutil/log.h b/src/libavutil/log.h similarity index 100% rename from libavutil/log.h rename to src/libavutil/log.h diff --git a/libavutil/log2_tab.c b/src/libavutil/log2_tab.c similarity index 100% rename from libavutil/log2_tab.c rename to src/libavutil/log2_tab.c diff --git a/libavutil/lzo.h b/src/libavutil/lzo.h similarity index 100% rename from libavutil/lzo.h rename to src/libavutil/lzo.h diff --git a/libavutil/macros.h b/src/libavutil/macros.h similarity index 100% rename from libavutil/macros.h rename to src/libavutil/macros.h diff --git a/libavutil/mathematics.h b/src/libavutil/mathematics.h similarity index 100% rename from libavutil/mathematics.h rename to src/libavutil/mathematics.h diff --git a/libavutil/md5.c b/src/libavutil/md5.c similarity index 100% rename from libavutil/md5.c rename to src/libavutil/md5.c diff --git a/libavutil/md5.h b/src/libavutil/md5.h similarity index 100% rename from libavutil/md5.h rename to src/libavutil/md5.h diff --git a/libavutil/mem.c b/src/libavutil/mem.c similarity index 100% rename from libavutil/mem.c rename to src/libavutil/mem.c diff --git a/libavutil/mem.h b/src/libavutil/mem.h similarity index 100% rename from libavutil/mem.h rename to src/libavutil/mem.h diff --git a/libavutil/motion_vector.h b/src/libavutil/motion_vector.h similarity index 100% rename from libavutil/motion_vector.h rename to src/libavutil/motion_vector.h diff --git a/libavutil/murmur3.h b/src/libavutil/murmur3.h similarity index 100% rename from libavutil/murmur3.h rename to src/libavutil/murmur3.h diff --git a/libavutil/old_pix_fmts.h b/src/libavutil/old_pix_fmts.h similarity index 100% rename from libavutil/old_pix_fmts.h rename to src/libavutil/old_pix_fmts.h diff --git a/libavutil/opencl.h b/src/libavutil/opencl.h similarity index 100% rename from libavutil/opencl.h rename to src/libavutil/opencl.h diff --git a/libavutil/opencl_internal.h b/src/libavutil/opencl_internal.h similarity index 100% rename from libavutil/opencl_internal.h rename to src/libavutil/opencl_internal.h diff --git a/libavutil/opt.h b/src/libavutil/opt.h similarity index 100% rename from libavutil/opt.h rename to src/libavutil/opt.h diff --git a/libavutil/parseutils.h b/src/libavutil/parseutils.h similarity index 100% rename from libavutil/parseutils.h rename to src/libavutil/parseutils.h diff --git a/libavutil/pca.h b/src/libavutil/pca.h similarity index 100% rename from libavutil/pca.h rename to src/libavutil/pca.h diff --git a/libavutil/pixdesc.c b/src/libavutil/pixdesc.c similarity index 100% rename from libavutil/pixdesc.c rename to src/libavutil/pixdesc.c diff --git a/libavutil/pixdesc.h b/src/libavutil/pixdesc.h similarity index 100% rename from libavutil/pixdesc.h rename to src/libavutil/pixdesc.h diff --git a/libavutil/pixelutils.h b/src/libavutil/pixelutils.h similarity index 100% rename from libavutil/pixelutils.h rename to src/libavutil/pixelutils.h diff --git a/libavutil/pixfmt.h b/src/libavutil/pixfmt.h similarity index 100% rename from libavutil/pixfmt.h rename to src/libavutil/pixfmt.h diff --git a/libavutil/qsort.h b/src/libavutil/qsort.h similarity index 100% rename from libavutil/qsort.h rename to src/libavutil/qsort.h diff --git a/libavutil/random_seed.h b/src/libavutil/random_seed.h similarity index 100% rename from libavutil/random_seed.h rename to src/libavutil/random_seed.h diff --git a/libavutil/rational.h b/src/libavutil/rational.h similarity index 100% rename from libavutil/rational.h rename to src/libavutil/rational.h diff --git a/libavutil/rc4.h b/src/libavutil/rc4.h similarity index 100% rename from libavutil/rc4.h rename to src/libavutil/rc4.h diff --git a/libavutil/replaygain.h b/src/libavutil/replaygain.h similarity index 100% rename from libavutil/replaygain.h rename to src/libavutil/replaygain.h diff --git a/libavutil/ripemd.h b/src/libavutil/ripemd.h similarity index 100% rename from libavutil/ripemd.h rename to src/libavutil/ripemd.h diff --git a/libavutil/samplefmt.h b/src/libavutil/samplefmt.h similarity index 100% rename from libavutil/samplefmt.h rename to src/libavutil/samplefmt.h diff --git a/libavutil/sha.h b/src/libavutil/sha.h similarity index 100% rename from libavutil/sha.h rename to src/libavutil/sha.h diff --git a/libavutil/sha512.h b/src/libavutil/sha512.h similarity index 100% rename from libavutil/sha512.h rename to src/libavutil/sha512.h diff --git a/libavutil/softfloat.h b/src/libavutil/softfloat.h similarity index 100% rename from libavutil/softfloat.h rename to src/libavutil/softfloat.h diff --git a/libavutil/stereo3d.h b/src/libavutil/stereo3d.h similarity index 100% rename from libavutil/stereo3d.h rename to src/libavutil/stereo3d.h diff --git a/libavutil/threadmessage.h b/src/libavutil/threadmessage.h similarity index 100% rename from libavutil/threadmessage.h rename to src/libavutil/threadmessage.h diff --git a/libavutil/time.h b/src/libavutil/time.h similarity index 100% rename from libavutil/time.h rename to src/libavutil/time.h diff --git a/libavutil/time_internal.h b/src/libavutil/time_internal.h similarity index 100% rename from libavutil/time_internal.h rename to src/libavutil/time_internal.h diff --git a/libavutil/timecode.h b/src/libavutil/timecode.h similarity index 100% rename from libavutil/timecode.h rename to src/libavutil/timecode.h diff --git a/libavutil/timer.h b/src/libavutil/timer.h similarity index 100% rename from libavutil/timer.h rename to src/libavutil/timer.h diff --git a/libavutil/timestamp.h b/src/libavutil/timestamp.h similarity index 100% rename from libavutil/timestamp.h rename to src/libavutil/timestamp.h diff --git a/libavutil/tree.h b/src/libavutil/tree.h similarity index 100% rename from libavutil/tree.h rename to src/libavutil/tree.h diff --git a/libavutil/version.h b/src/libavutil/version.h similarity index 100% rename from libavutil/version.h rename to src/libavutil/version.h diff --git a/libavutil/x86_cpu.h b/src/libavutil/x86_cpu.h similarity index 100% rename from libavutil/x86_cpu.h rename to src/libavutil/x86_cpu.h diff --git a/libavutil/xga_font_data.h b/src/libavutil/xga_font_data.h similarity index 100% rename from libavutil/xga_font_data.h rename to src/libavutil/xga_font_data.h diff --git a/libavutil/xtea.h b/src/libavutil/xtea.h similarity index 100% rename from libavutil/xtea.h rename to src/libavutil/xtea.h diff --git a/libbpg.c b/src/libbpg.c similarity index 100% rename from libbpg.c rename to src/libbpg.c diff --git a/libbpg.h b/src/libbpg.h similarity index 100% rename from libbpg.h rename to src/libbpg.h diff --git a/post.js b/src/post.js similarity index 100% rename from post.js rename to src/post.js diff --git a/tmalloc.c b/src/tmalloc.c similarity index 100% rename from tmalloc.c rename to src/tmalloc.c diff --git a/x265_glue.c b/src/x265_glue.c similarity index 100% rename from x265_glue.c rename to src/x265_glue.c