diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-02-27 10:34:31 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-02-27 10:34:31 +0100 |
| commit | 33a2b45c2e180c94fa7277d73f9e9595e6617e56 (patch) | |
| tree | 6a0615486c03e639bf0651b6111d0d26b2da9bbf /libavformat/srtenc.c | |
| parent | 64bb64f704f751c50f8474e85eb84a6326b44b50 (diff) | |
| parent | 291e49d4e7db4b982621d7a25e258f898cfc3217 (diff) | |
| download | ffmpeg-33a2b45c2e180c94fa7277d73f9e9595e6617e56.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
af_compand: add a dependency on strtok_r
Conflicts:
configure
Not merged as FFmpegs compand filter does not depend on strtok_r
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/srtenc.c')
0 files changed, 0 insertions, 0 deletions