diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-03-05 12:37:15 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-03-05 12:37:15 +0100 |
| commit | 1567095acf03f712b511a5b6fc7f56e8b0044482 (patch) | |
| tree | 8736e8e8f8bf1dfb9a64220d3ec0b36caeded600 /libavformat/hlsenc.c | |
| parent | 1cb3ca2a67fefa097de12fa163a0be42018592af (diff) | |
| parent | 2a7ab2dfaa7d5eeceb2d449230857bfcf6bfc9d6 (diff) | |
| download | ffmpeg-1567095acf03f712b511a5b6fc7f56e8b0044482.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
configure: Use check_builtin() where appropriate
Conflicts:
configure
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/hlsenc.c')
0 files changed, 0 insertions, 0 deletions