diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-05-19 13:00:31 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-05-19 13:00:31 +0200 |
| commit | 3c7650a83d3bdca2fd680af722de344b092f65ec (patch) | |
| tree | a41bd4809a90135ba39cc464e283663a8ed27672 /Doxyfile | |
| parent | 75a37b57a59f6701d9443c5f7a0ceec108b27a18 (diff) | |
| parent | ea91e77127229015d23a046f1797d3fc6a33e54d (diff) | |
| download | ffmpeg-3c7650a83d3bdca2fd680af722de344b092f65ec.tar.gz | |
Merge remote-tracking branch 'qatar/master'
This early morning merge should fix --disable-yasm
* qatar/master:
Clean up #includes in cmdutils.h.
g729: Merge g729.h into g729dec.c.
10l: wrap float_interleave functions in HAVE_YASM.
Conflicts:
libavcodec/g729.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'Doxyfile')
0 files changed, 0 insertions, 0 deletions