From cdc8e76ec5747225928b58f00e2bce457f8e62e7 Mon Sep 17 00:00:00 2001 From: LostInKadath Date: Mon, 6 Nov 2023 12:33:58 +0400 Subject: [PATCH] Revert "Recombine sources" This reverts commit d3ae487ecbb578275114243617647033203a48a6. --- Makefile.am | 10 +++++----- Makefile.unix | 12 ++++++------ src/bs.h => bs.h | 0 configure.ac | 2 +- src/h264_analyze.c => h264_analyze.c | 0 src/h264_avcc.c => h264_avcc.c | 0 src/h264_avcc.h => h264_avcc.h | 0 src/h264_nal.c => h264_nal.c | 0 src/h264_sei.c => h264_sei.c | 0 src/h264_sei.h => h264_sei.h | 0 src/h264_sei.in.c => h264_sei.in.c | 0 src/h264_slice_data.c => h264_slice_data.c | 0 src/h264_slice_data.h => h264_slice_data.h | 0 src/h264_slice_data.in.c => h264_slice_data.in.c | 0 src/h264_stream.c => h264_stream.c | 0 src/h264_stream.h => h264_stream.h | 0 src/h264_stream.in.c => h264_stream.in.c | 0 src/svc_split.c => svc_split.c | 0 18 files changed, 12 insertions(+), 12 deletions(-) rename src/bs.h => bs.h (100%) rename src/h264_analyze.c => h264_analyze.c (100%) rename src/h264_avcc.c => h264_avcc.c (100%) rename src/h264_avcc.h => h264_avcc.h (100%) rename src/h264_nal.c => h264_nal.c (100%) rename src/h264_sei.c => h264_sei.c (100%) rename src/h264_sei.h => h264_sei.h (100%) rename src/h264_sei.in.c => h264_sei.in.c (100%) rename src/h264_slice_data.c => h264_slice_data.c (100%) rename src/h264_slice_data.h => h264_slice_data.h (100%) rename src/h264_slice_data.in.c => h264_slice_data.in.c (100%) rename src/h264_stream.c => h264_stream.c (100%) rename src/h264_stream.h => h264_stream.h (100%) rename src/h264_stream.in.c => h264_stream.in.c (100%) rename src/svc_split.c => svc_split.c (100%) diff --git a/Makefile.am b/Makefile.am index 03dc680..c73fd70 100644 --- a/Makefile.am +++ b/Makefile.am @@ -9,16 +9,16 @@ bin_PROGRAMS = h264_analyze svc_split lib_LTLIBRARIES = libh264bitstream.la libh264bitstream_la_LDFLAGS = -no-undefined -libh264bitstream_la_SOURCES = src/h264_stream.c src/h264_sei.c src/h264_nal.c +libh264bitstream_la_SOURCES = h264_stream.c h264_sei.c h264_nal.c -h264_analyze_SOURCES = src/h264_analyze.c +h264_analyze_SOURCES = h264_analyze.c h264_analyze_LDADD = libh264bitstream.la -svc_split_SOURCES = src/svc_split.c +svc_split_SOURCES = svc_split.c svc_split_LDADD = libh264bitstream.la -include_HEADERS = src/h264_stream.h src/h264_sei.h src/h264_avcc.h -pkginclude_HEADERS = src/h264_stream.h src/h264_sei.h src/h264_avcc.h src/bs.h +include_HEADERS = h264_stream.h h264_sei.h h264_avcc.h +pkginclude_HEADERS = h264_stream.h h264_sei.h h264_avcc.h bs.h clean-local: rm -rf *.pc diff --git a/Makefile.unix b/Makefile.unix index 97bbb73..b954dd5 100644 --- a/Makefile.unix +++ b/Makefile.unix @@ -28,11 +28,11 @@ all: libh264bitstream.a $(BINARIES) h264_analyze: h264_analyze.o libh264bitstream.a $(LD) $(LDFLAGS) -o h264_analyze h264_analyze.o -L. -lh264bitstream -lm -libh264bitstream.a: src/h264_stream.c src/h264_nal.c src/h264_stream.h src/h264_slice_data.c src/h264_slice_data.h src/h264_sei.c src/h264_sei.h - $(CC) $(CFLAGS) -c -o h264_nal.o src/h264_nal.c - $(CC) $(CFLAGS) -c -o h264_stream.o src/h264_stream.c - $(CC) $(CFLAGS) -c -o h264_slice_data.o src/h264_slice_data.c - $(CC) $(CFLAGS) -c -o h264_sei.o src/h264_sei.c +libh264bitstream.a: h264_stream.c h264_nal.c h264_stream.h h264_slice_data.c h264_slice_data.h h264_sei.c h264_sei.h + $(CC) $(CFLAGS) -c -o h264_nal.o h264_nal.c + $(CC) $(CFLAGS) -c -o h264_stream.o h264_stream.c + $(CC) $(CFLAGS) -c -o h264_slice_data.o h264_slice_data.c + $(CC) $(CFLAGS) -c -o h264_sei.o h264_sei.c $(AR) $(ARFLAGS) libh264bitstream.a h264_stream.o h264_nal.o h264_slice_data.o h264_sei.o @@ -40,7 +40,7 @@ clean: rm -f *.o libh264bitstream.a $(BINARIES) rm -f libh264bitstream-uninstalled.sh libh264bitstream.pc.in -dox: src/h264_stream.c src/h264_stream.h src/bs.h Doxyfile +dox: h264_stream.c h264_stream.h bs.h Doxyfile doxygen Doxyfile dist: clean diff --git a/src/bs.h b/bs.h similarity index 100% rename from src/bs.h rename to bs.h diff --git a/configure.ac b/configure.ac index 0bc413a..f31ffbd 100644 --- a/configure.ac +++ b/configure.ac @@ -1,6 +1,6 @@ AC_INIT([h264bitstream],[0.2.0],[aizvorski@gmail.com]) -AC_CONFIG_SRCDIR(./src/h264_stream.c) +AC_CONFIG_SRCDIR(./h264_stream.c) AC_CONFIG_AUX_DIR(build-aux) diff --git a/src/h264_analyze.c b/h264_analyze.c similarity index 100% rename from src/h264_analyze.c rename to h264_analyze.c diff --git a/src/h264_avcc.c b/h264_avcc.c similarity index 100% rename from src/h264_avcc.c rename to h264_avcc.c diff --git a/src/h264_avcc.h b/h264_avcc.h similarity index 100% rename from src/h264_avcc.h rename to h264_avcc.h diff --git a/src/h264_nal.c b/h264_nal.c similarity index 100% rename from src/h264_nal.c rename to h264_nal.c diff --git a/src/h264_sei.c b/h264_sei.c similarity index 100% rename from src/h264_sei.c rename to h264_sei.c diff --git a/src/h264_sei.h b/h264_sei.h similarity index 100% rename from src/h264_sei.h rename to h264_sei.h diff --git a/src/h264_sei.in.c b/h264_sei.in.c similarity index 100% rename from src/h264_sei.in.c rename to h264_sei.in.c diff --git a/src/h264_slice_data.c b/h264_slice_data.c similarity index 100% rename from src/h264_slice_data.c rename to h264_slice_data.c diff --git a/src/h264_slice_data.h b/h264_slice_data.h similarity index 100% rename from src/h264_slice_data.h rename to h264_slice_data.h diff --git a/src/h264_slice_data.in.c b/h264_slice_data.in.c similarity index 100% rename from src/h264_slice_data.in.c rename to h264_slice_data.in.c diff --git a/src/h264_stream.c b/h264_stream.c similarity index 100% rename from src/h264_stream.c rename to h264_stream.c diff --git a/src/h264_stream.h b/h264_stream.h similarity index 100% rename from src/h264_stream.h rename to h264_stream.h diff --git a/src/h264_stream.in.c b/h264_stream.in.c similarity index 100% rename from src/h264_stream.in.c rename to h264_stream.in.c diff --git a/src/svc_split.c b/svc_split.c similarity index 100% rename from src/svc_split.c rename to svc_split.c