From ecba764e576a382d38460cde00a31eef9205b58e Mon Sep 17 00:00:00 2001 From: Martin Pulec Date: Thu, 18 Aug 2022 11:20:38 +0200 Subject: [PATCH] moved libavcodec_common to libavcodec/lavc_common --- configure.ac | 6 +++--- src/audio/codec/libavcodec.cpp | 2 +- src/capture_filter/blank.cpp | 2 +- src/hwaccel_libav_common.c | 2 +- src/libavcodec/from_lavc_vid_conv.h | 2 +- src/{libavcodec_common.c => libavcodec/lavc_common.c} | 4 ++-- src/{libavcodec_common.h => libavcodec/lavc_common.h} | 8 ++++---- src/libavcodec/lavc_video.c | 2 +- src/libavcodec/lavc_video.h | 2 +- src/libavcodec/to_lavc_vid_conv.h | 2 +- src/video_capture/file.c | 2 +- src/video_compress/libavcodec.cpp | 2 +- src/video_decompress/libavcodec.c | 2 +- 13 files changed, 19 insertions(+), 19 deletions(-) rename src/{libavcodec_common.c => libavcodec/lavc_common.c} (98%) rename src/{libavcodec_common.h => libavcodec/lavc_common.h} (97%) diff --git a/configure.ac b/configure.ac index 1c8bdc634..23cfd96bc 100644 --- a/configure.ac +++ b/configure.ac @@ -1579,7 +1579,7 @@ then CFLAGS="$CFLAGS ${BLANK_CFLAGS}" CXXFLAGS="$CXXFLAGS ${BLANK_CFLAGS}" BLANK_OBJ="src/capture_filter/blank.o" - BLANK_OBJ="$BLANK_OBJ src/libavcodec_common.o" # get_ug_to_av_pixfmt() + BLANK_OBJ="$BLANK_OBJ src/libavcodec/lavc_common.o" # get_ug_to_av_pixfmt() ADD_MODULE("vcapfilter_blank", "$BLANK_OBJ", "$BLANK_LIBS") blank=yes fi @@ -1839,7 +1839,7 @@ fi if test $libavcodec_req != no -a $found_libavcodec = yes -a $found_libavutil = yes then - LIBAVCODEC_COMMON="src/libavcodec_common.o" + LIBAVCODEC_COMMON="src/libavcodec/lavc_common.o" LIBAVCODEC_VIDEO="src/libavcodec/lavc_video.o src/libavcodec/from_lavc_vid_conv.o src/libavcodec/to_lavc_vid_conv.o" AC_DEFINE([HAVE_LAVC], [1], [Build with LAVC support]) LIBAVCODEC_AUDIO_CODEC_OBJ="$LIBAVCODEC_COMMON src/audio/codec/libavcodec.o" @@ -1902,7 +1902,7 @@ then COMMON_FLAGS="$COMMON_FLAGS $LIBAVFORMAT_CFLAGS" file=yes - ADD_MODULE("vidcap_file", "src/libavcodec_common.o src/video_capture/file.o", "$LIBAVCODEC_LIBS $LIBAVFORMAT_LIBS $LIBSWSCALE_LIBS") + ADD_MODULE("vidcap_file", "src/libavcodec/lavc_common.o src/video_capture/file.o", "$LIBAVCODEC_LIBS $LIBAVFORMAT_LIBS $LIBSWSCALE_LIBS") fi if test $file_req = yes -a $file = no; then diff --git a/src/audio/codec/libavcodec.cpp b/src/audio/codec/libavcodec.cpp index 53afb7129..7324e5ce9 100644 --- a/src/audio/codec/libavcodec.cpp +++ b/src/audio/codec/libavcodec.cpp @@ -65,7 +65,7 @@ extern "C" { #include "audio/audio.h" #include "audio/codec.h" #include "audio/utils.h" -#include "libavcodec_common.h" +#include "libavcodec/lavc_common.h" #define MAGIC 0xb135ca11 #define LOW_LATENCY_AUDIOENC_FRAME_DURATION 2.5 diff --git a/src/capture_filter/blank.cpp b/src/capture_filter/blank.cpp index 16146f2f9..2841917e7 100644 --- a/src/capture_filter/blank.cpp +++ b/src/capture_filter/blank.cpp @@ -42,7 +42,7 @@ #endif /* HAVE_CONFIG_H */ #include "capture_filter.h" -#include "libavcodec_common.h" +#include "libavcodec/lavc_common.h" #include "lib_common.h" #include "messaging.h" #include "module.h" diff --git a/src/hwaccel_libav_common.c b/src/hwaccel_libav_common.c index d267a530b..b22e3a7e5 100644 --- a/src/hwaccel_libav_common.c +++ b/src/hwaccel_libav_common.c @@ -48,7 +48,7 @@ #endif #include "hwaccel_libav_common.h" -#include "libavcodec_common.h" +#include "libavcodec/lavc_common.h" void hwaccel_state_init(struct hw_accel_state *hwaccel){ hwaccel->type = HWACCEL_NONE; diff --git a/src/libavcodec/from_lavc_vid_conv.h b/src/libavcodec/from_lavc_vid_conv.h index 23bdfeb7a..3b06f45d9 100644 --- a/src/libavcodec/from_lavc_vid_conv.h +++ b/src/libavcodec/from_lavc_vid_conv.h @@ -38,7 +38,7 @@ #ifndef LIBAVCODEC_FROM_LAVC_VID_CONV_H_97E7417B_773A_453F_BB1A_37841E167152 #define LIBAVCODEC_FROM_LAVC_VID_CONV_H_97E7417B_773A_453F_BB1A_37841E167152 -#include "libavcodec_common.h" +#include "libavcodec/lavc_common.h" #ifdef __cplusplus extern "C" { diff --git a/src/libavcodec_common.c b/src/libavcodec/lavc_common.c similarity index 98% rename from src/libavcodec_common.c rename to src/libavcodec/lavc_common.c index a0862a2bd..96be00237 100644 --- a/src/libavcodec_common.c +++ b/src/libavcodec/lavc_common.c @@ -1,5 +1,5 @@ /** - * @file libavcodec_common.c + * @file lavc_common.c * @author Martin Pulec * @author Martin Piatka <445597@mail.muni.cz> */ @@ -55,7 +55,7 @@ #include #include "host.h" -#include "libavcodec_common.h" +#include "libavcodec/lavc_common.h" #include "video.h" // diff --git a/src/libavcodec_common.h b/src/libavcodec/lavc_common.h similarity index 97% rename from src/libavcodec_common.h rename to src/libavcodec/lavc_common.h index 5c5381888..c66d1f65b 100644 --- a/src/libavcodec_common.h +++ b/src/libavcodec/lavc_common.h @@ -1,5 +1,5 @@ /** - * @file libavcodec_common.h + * @file libavcodec/lavc_common.h * @author Martin Pulec */ /* @@ -34,8 +34,8 @@ * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef LIBAVCODEC_COMMON_H_ -#define LIBAVCODEC_COMMON_H_ +#ifndef LAVC_COMMON_H_C9D57362_067F_45AD_A491_A8084A39E675 +#define LAVC_COMMON_H_C9D57362_067F_45AD_A491_A8084A39E675 #include "debug.h" #include "types.h" @@ -237,5 +237,5 @@ void ug_set_av_log_level(void); } #endif -#endif // LIBAVCODEC_COMMON_H_ +#endif // defined LAVC_COMMON_H_C9D57362_067F_45AD_A491_A8084A39E675 diff --git a/src/libavcodec/lavc_video.c b/src/libavcodec/lavc_video.c index 5a0f7cfc4..9302ddb38 100644 --- a/src/libavcodec/lavc_video.c +++ b/src/libavcodec/lavc_video.c @@ -50,8 +50,8 @@ #include "config_win32.h" #endif // HAVE_CONFIG_H -#include "libavcodec_common.h" #include "lib_common.h" +#include "libavcodec/lavc_common.h" #include "libavcodec/lavc_video.h" #ifdef HAVE_SWSCALE diff --git a/src/libavcodec/lavc_video.h b/src/libavcodec/lavc_video.h index e5e32406c..98fb128c0 100644 --- a/src/libavcodec/lavc_video.h +++ b/src/libavcodec/lavc_video.h @@ -44,7 +44,7 @@ #include #endif -#include "libavcodec_common.h" +#include "libavcodec/lavc_common.h" #ifdef __cplusplus extern "C" { diff --git a/src/libavcodec/to_lavc_vid_conv.h b/src/libavcodec/to_lavc_vid_conv.h index 94615400d..bfc5de73f 100644 --- a/src/libavcodec/to_lavc_vid_conv.h +++ b/src/libavcodec/to_lavc_vid_conv.h @@ -38,7 +38,7 @@ #ifndef LIBAVCODEC_TO_LAVC_VID_CONV_0C22E28C_A3F1_489D_87DC_E56D76E3598B #define LIBAVCODEC_TO_LAVC_VID_CONV_0C22E28C_A3F1_489D_87DC_E56D76E3598B -#include "libavcodec_common.h" +#include "libavcodec/lavc_common.h" #ifdef __cplusplus extern "C" { diff --git a/src/video_capture/file.c b/src/video_capture/file.c index 8a933ec1e..100f094fa 100644 --- a/src/video_capture/file.c +++ b/src/video_capture/file.c @@ -69,7 +69,7 @@ #include "audio/utils.h" #include "debug.h" #include "lib_common.h" -#include "libavcodec_common.h" +#include "libavcodec/lavc_common.h" #include "libavcodec/from_lavc_vid_conv.h" #include "messaging.h" #include "module.h" diff --git a/src/video_compress/libavcodec.cpp b/src/video_compress/libavcodec.cpp index fd709a3d6..df2036c1d 100644 --- a/src/video_compress/libavcodec.cpp +++ b/src/video_compress/libavcodec.cpp @@ -60,7 +60,7 @@ #include "debug.h" #include "host.h" #include "lib_common.h" -#include "libavcodec_common.h" +#include "libavcodec/lavc_common.h" #include "libavcodec/lavc_video.h" #include "libavcodec/to_lavc_vid_conv.h" #include "messaging.h" diff --git a/src/video_decompress/libavcodec.c b/src/video_decompress/libavcodec.c index cff98d800..6d27d52c0 100644 --- a/src/video_decompress/libavcodec.c +++ b/src/video_decompress/libavcodec.c @@ -43,7 +43,7 @@ #include "debug.h" #include "host.h" -#include "libavcodec_common.h" +#include "libavcodec/lavc_common.h" #include "libavcodec/lavc_video.h" #include "libavcodec/from_lavc_vid_conv.h" #include "lib_common.h"