mirror of
https://github.com/owntone/owntone-server.git
synced 2025-03-31 01:33:44 -04:00
[trancode/artwork] Put back compability with older versions of ffmpeg/libav
This commit is contained in:
parent
f9375ef915
commit
c13ed8761a
@ -256,6 +256,9 @@ FORK_MODULES_CHECK([FORKED], [LIBAV],
|
|||||||
AC_CHECK_HEADERS([libavutil/channel_layout.h libavutil/mathematics.h])
|
AC_CHECK_HEADERS([libavutil/channel_layout.h libavutil/mathematics.h])
|
||||||
])
|
])
|
||||||
|
|
||||||
|
dnl TODO Actually test for this
|
||||||
|
AM_CONDITIONAL([COND_FFMPEG_LEGACY], [[test "yes" = "no"]])
|
||||||
|
|
||||||
AC_CHECK_SIZEOF([void *])
|
AC_CHECK_SIZEOF([void *])
|
||||||
|
|
||||||
dnl --- Begin configuring the options ---
|
dnl --- Begin configuring the options ---
|
||||||
|
@ -43,6 +43,12 @@ else
|
|||||||
MDNS_SRC=mdns_dnssd.c
|
MDNS_SRC=mdns_dnssd.c
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
if COND_FFMPEG_LEGACY
|
||||||
|
FFMPEG_SRC=transcode_legacy.c artwork_legacy.c ffmpeg-compat.h
|
||||||
|
else
|
||||||
|
FFMPEG_SRC=transcode.c artwork.c
|
||||||
|
endif
|
||||||
|
|
||||||
GPERF_FILES = \
|
GPERF_FILES = \
|
||||||
daap_query.gperf \
|
daap_query.gperf \
|
||||||
rsp_query.gperf \
|
rsp_query.gperf \
|
||||||
@ -105,8 +111,7 @@ forked_daapd_SOURCES = main.c \
|
|||||||
httpd_streaming.c httpd_streaming.h \
|
httpd_streaming.c httpd_streaming.h \
|
||||||
http.c http.h \
|
http.c http.h \
|
||||||
dmap_common.c dmap_common.h \
|
dmap_common.c dmap_common.h \
|
||||||
transcode.c transcode.h \
|
$(FFMPEG_SRC) \
|
||||||
artwork.c artwork.h \
|
|
||||||
misc.c misc.h \
|
misc.c misc.h \
|
||||||
rng.c rng.h \
|
rng.c rng.h \
|
||||||
rsp_query.c rsp_query.h \
|
rsp_query.c rsp_query.h \
|
||||||
@ -125,7 +130,7 @@ forked_daapd_SOURCES = main.c \
|
|||||||
$(MPD_SRC) \
|
$(MPD_SRC) \
|
||||||
listener.c listener.h \
|
listener.c listener.h \
|
||||||
commands.c commands.h \
|
commands.c commands.h \
|
||||||
ffmpeg-compat.h mxml-compat.h \
|
mxml-compat.h \
|
||||||
$(GPERF_SRC) \
|
$(GPERF_SRC) \
|
||||||
$(ANTLR_SRC)
|
$(ANTLR_SRC)
|
||||||
|
|
||||||
|
1627
src/artwork_legacy.c
Normal file
1627
src/artwork_legacy.c
Normal file
File diff suppressed because it is too large
Load Diff
1677
src/transcode_legacy.c
Normal file
1677
src/transcode_legacy.c
Normal file
File diff suppressed because it is too large
Load Diff
Loading…
x
Reference in New Issue
Block a user