Changeset 56e11d23 in ffmpeg

Timestamp:

Jun 20, 2011, 2:07:34 AM (13 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

54dd50d1

Parents:

4aeb7769 (diff), 8d3d3436 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

git-author:

Michael Niedermayer <michaelni@gmx.at> (06/20/11 01:49:51)

git-committer:

Michael Niedermayer <michaelni@gmx.at> (06/20/11 02:07:34)

Message:

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>

(No files)