[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])
|
||||
])
|
||||
|
||||
dnl TODO Actually test for this
|
||||
AM_CONDITIONAL([COND_FFMPEG_LEGACY], [[test "yes" = "no"]])
|
||||
|
||||
AC_CHECK_SIZEOF([void *])
|
||||
|
||||
dnl --- Begin configuring the options ---
|
||||
|
|
|
@ -43,6 +43,12 @@ else
|
|||
MDNS_SRC=mdns_dnssd.c
|
||||
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 = \
|
||||
daap_query.gperf \
|
||||
rsp_query.gperf \
|
||||
|
@ -105,8 +111,7 @@ forked_daapd_SOURCES = main.c \
|
|||
httpd_streaming.c httpd_streaming.h \
|
||||
http.c http.h \
|
||||
dmap_common.c dmap_common.h \
|
||||
transcode.c transcode.h \
|
||||
artwork.c artwork.h \
|
||||
$(FFMPEG_SRC) \
|
||||
misc.c misc.h \
|
||||
rng.c rng.h \
|
||||
rsp_query.c rsp_query.h \
|
||||
|
@ -125,7 +130,7 @@ forked_daapd_SOURCES = main.c \
|
|||
$(MPD_SRC) \
|
||||
listener.c listener.h \
|
||||
commands.c commands.h \
|
||||
ffmpeg-compat.h mxml-compat.h \
|
||||
mxml-compat.h \
|
||||
$(GPERF_SRC) \
|
||||
$(ANTLR_SRC)
|
||||
|
||||
|
|
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
Loading…
Reference in New Issue