diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-06-12 03:26:38 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-06-12 04:30:19 +0200 |
| commit | d127d26997ff046a9f112643eebd1007590b4fa2 (patch) | |
| tree | bdfe95a65bb300bd240e6c897ec43ce68cd0f30a /libavformat/flvenc.c | |
| parent | 2291e18e4891066bbcbcd1a4e468a59a40e9cb5c (diff) | |
| parent | 151c5841881591552be685b7fd50b488f128ba5b (diff) | |
| download | ffmpeg-d127d26997ff046a9f112643eebd1007590b4fa2.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
build: fix "make install" with documentation disabled
build: simplify some conditional targets
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/flvenc.c')
0 files changed, 0 insertions, 0 deletions