scottk/UltraGrid
1
0
Fork 0
mirror of https://github.com/outbackdingo/UltraGrid.git synced 2026-03-20 01:09:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

moved libavcodec_common to libavcodec/lavc_common

Browse Source
This commit is contained in:
Martin Pulec
2022-08-18 11:20:38 +02:00
parent 1b4d3209b8
commit ecba764e57
13 changed files with 19 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
configure.ac
View File

@@ -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

2
src/audio/codec/libavcodec.cpp
View File

@@ -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

2
src/capture_filter/blank.cpp
View File

@@ -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"

2
src/hwaccel_libav_common.c
View File

@@ -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;

2
src/libavcodec/from_lavc_vid_conv.h
View File

@@ -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" {

4
src/libavcodec_common.c → src/libavcodec/lavc_common.c
View File

@@ -1,5 +1,5 @@
/**
* @file libavcodec_common.c
* @file lavc_common.c
* @author Martin Pulec <pulec@cesnet.cz>
* @author Martin Piatka <445597@mail.muni.cz>
*/
@@ -55,7 +55,7 @@
#include <stdint.h>
#include "host.h"
#include "libavcodec_common.h"
#include "libavcodec/lavc_common.h"
#include "video.h"
//

8
src/libavcodec_common.h → src/libavcodec/lavc_common.h
View File

@@ -1,5 +1,5 @@
/**
* @file libavcodec_common.h
* @file libavcodec/lavc_common.h
* @author Martin Pulec <martin.pulec@cesnet.cz>
*/
/*
@@ -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

2
src/libavcodec/lavc_video.c
View File

@@ -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

2
src/libavcodec/lavc_video.h
View File

@@ -44,7 +44,7 @@
#include <stdio.h>
#endif
#include "libavcodec_common.h"
#include "libavcodec/lavc_common.h"
#ifdef __cplusplus
extern "C" {

2
src/libavcodec/to_lavc_vid_conv.h
View File

@@ -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" {

2
src/video_capture/file.c
View File

@@ -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"

2
src/video_compress/libavcodec.cpp
View File

@@ -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"

2
src/video_decompress/libavcodec.c
View File

@@ -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"