diff options
| author | James Almer <jamrial@gmail.com> | 2017-11-11 18:04:22 -0300 |
|---|---|---|
| committer | James Almer <jamrial@gmail.com> | 2017-11-11 18:04:22 -0300 |
| commit | fb94e7b39a170d4b7fdf66e5d997525a76f12ab2 (patch) | |
| tree | 38245f686288a748c0034c5b0eab6bbd23a85786 | |
| parent | 8725cf424c90e7177e0b920e4a10bd60f4b80c38 (diff) | |
| download | ffmpeg-fb94e7b39a170d4b7fdf66e5d997525a76f12ab2.tar.gz | |
Revert "Merge commit '8e97a8c69162afce47abea96c8c0914f3550e212'"
This reverts commit 1a4315f24d2c5857ebeb379fe39f0124746ee30a, reversing
changes made to 869401cefc22e221edbf135bacaa1f21014fd001.
At least one distro (Arch) ships gsm.h inside the gsm/ folder
| -rwxr-xr-x | configure | 5 | ||||
| -rw-r--r-- | libavcodec/libgsmdec.c | 5 | ||||
| -rw-r--r-- | libavcodec/libgsmenc.c | 5 |
3 files changed, 14 insertions, 1 deletions
@@ -1922,6 +1922,7 @@ HEADERS_LIST=" dxgidebug_h dxva_h ES2_gl_h + gsm_h io_h machine_ioctl_bt848_h machine_ioctl_meteor_h @@ -5921,7 +5922,9 @@ enabled libfreetype && require_pkg_config libfreetype freetype2 "ft2build. enabled libfribidi && require_pkg_config libfribidi fribidi fribidi.h fribidi_version_info enabled libgme && { check_pkg_config libgme libgme gme/gme.h gme_new_emu || require libgme gme/gme.h gme_new_emu -lgme -lstdc++; } -enabled libgsm && require libgsm gsm.h gsm_create -lgsm +enabled libgsm && { for gsm_hdr in "gsm.h" "gsm/gsm.h"; do + check_lib libgsm "${gsm_hdr}" gsm_create -lgsm && break; + done || die "ERROR: libgsm not found"; } enabled libilbc && require libilbc ilbc.h WebRtcIlbcfix_InitDecode -lilbc $pthreads_extralibs enabled libkvazaar && require_pkg_config libkvazaar "kvazaar >= 0.8.1" kvazaar.h kvz_api_get # While it may appear that require is being used as a pkg-config diff --git a/libavcodec/libgsmdec.c b/libavcodec/libgsmdec.c index 85bb022b97..a503215f67 100644 --- a/libavcodec/libgsmdec.c +++ b/libavcodec/libgsmdec.c @@ -27,7 +27,12 @@ // The idiosyncrasies of GSM-in-WAV are explained at http://kbs.cs.tu-berlin.de/~jutta/toast.html +#include "config.h" +#if HAVE_GSM_H #include <gsm.h> +#else +#include <gsm/gsm.h> +#endif #include "libavutil/channel_layout.h" #include "libavutil/common.h" diff --git a/libavcodec/libgsmenc.c b/libavcodec/libgsmenc.c index b60b23b31d..e25db95181 100644 --- a/libavcodec/libgsmenc.c +++ b/libavcodec/libgsmenc.c @@ -27,7 +27,12 @@ // The idiosyncrasies of GSM-in-WAV are explained at http://kbs.cs.tu-berlin.de/~jutta/toast.html +#include "config.h" +#if HAVE_GSM_H #include <gsm.h> +#else +#include <gsm/gsm.h> +#endif #include "libavutil/common.h" |