Merge commit '8e97a8c69162afce47abea96c8c0914f3550e212'
authorJames Almer <jamrial@gmail.com>
Sat, 11 Nov 2017 19:12:16 +0000 (16:12 -0300)
committerJames Almer <jamrial@gmail.com>
Sat, 11 Nov 2017 19:13:23 +0000 (16:13 -0300)
commit1a4315f24d2c5857ebeb379fe39f0124746ee30a
treea4d7c7d51cad0a9bb63b4a72121cfa8111dc303d
parent869401cefc22e221edbf135bacaa1f21014fd001
parent8e97a8c69162afce47abea96c8c0914f3550e212
Merge commit '8e97a8c69162afce47abea96c8c0914f3550e212'

* commit '8e97a8c69162afce47abea96c8c0914f3550e212':
  build: Remove check for gsm/gsm.h for libgsm

Also includes fix from 010baac12a14d684a1ae72f6b7509e642c40f3b3

Merged-by: James Almer <jamrial@gmail.com>
configure
libavcodec/libgsmdec.c
libavcodec/libgsmenc.c