diff options
| author | James Almer <jamrial@gmail.com> | 2017-11-11 16:12:16 -0300 |
|---|---|---|
| committer | James Almer <jamrial@gmail.com> | 2017-11-11 16:13:23 -0300 |
| commit | 1a4315f24d2c5857ebeb379fe39f0124746ee30a (patch) | |
| tree | a4d7c7d51cad0a9bb63b4a72121cfa8111dc303d /libavcodec/mpeg12.c | |
| parent | 869401cefc22e221edbf135bacaa1f21014fd001 (diff) | |
| parent | 8e97a8c69162afce47abea96c8c0914f3550e212 (diff) | |
| download | ffmpeg-1a4315f24d2c5857ebeb379fe39f0124746ee30a.tar.gz | |
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>
Diffstat (limited to 'libavcodec/mpeg12.c')
0 files changed, 0 insertions, 0 deletions