diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-06-20 03:49:51 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-06-20 04:07:34 +0200 |
| commit | 56e11d230525bb9659e79d3253351b94ec3f8478 (patch) | |
| tree | bfe7699bce96baf2092ba871a58c7d6845657632 /cmdutils.c | |
| parent | 4aeb7769136ae60586d88d17fcce05be9669e72a (diff) | |
| parent | 8d3d3436e2596e27571b86eb97c66971a1a7431b (diff) | |
| download | ffmpeg-56e11d230525bb9659e79d3253351b94ec3f8478.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
Drop git- prefix from version labels
Use the contents of RELEASE as version fallback instead of 'UNKNOWN'
path64/open64: filter out unsupported flags
Add Release Notes
sipr: Drop unused DSPContext
sipr: include string.h for mem*()
sipr: Use memmove() to copy overlapped buffers.
h264: drop some ugly casts
Conflicts:
version.sh
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'cmdutils.c')
0 files changed, 0 insertions, 0 deletions