diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-11-27 02:26:03 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-11-27 02:27:24 +0100 |
| commit | 6f24566f56b8ed0424a77aede46bb3ddf06a28c8 (patch) | |
| tree | 79353c84699f1ac09d94832ad690dbcc6d3bddf7 /libavcodec/libshine.c | |
| parent | 5b326f398e9dd289662866af9366f2d44c4d4d9b (diff) | |
| parent | 4da3f410d176dd1a55d7cbe5d2e2ead342027f13 (diff) | |
| download | ffmpeg-6f24566f56b8ed0424a77aede46bb3ddf06a28c8.tar.gz | |
Merge commit '4da3f410d176dd1a55d7cbe5d2e2ead342027f13'
* commit '4da3f410d176dd1a55d7cbe5d2e2ead342027f13':
configure: Restore doc option to disable building the documentation
Conflicts:
configure
See: eff2edae562096c1e21e8c048392ffe8968181f2
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/libshine.c')
0 files changed, 0 insertions, 0 deletions