projects / ffmpeg.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 4aeb776 8d3d343)
Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 20 Jun 2011 01:49:51 +0000 (03:49 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 20 Jun 2011 02:07:34 +0000 (04:07 +0200)
commit56e11d230525bb9659e79d3253351b94ec3f8478
treebfe7699bce96baf2092ba871a58c7d6845657632tree | snapshot
parent4aeb7769136ae60586d88d17fcce05be9669e72acommit | diff
parent8d3d3436e2596e27571b86eb97c66971a1a7431bcommit | diff
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>
configure diff1 | diff2 | blob | history
doc/RELEASE_NOTES | diff2 | blob | history
libavcodec/h264.c diff1 | diff2 | blob | history
libavcodec/sipr.c diff1 | diff2 | blob | history
libavcodec/sipr.h diff1 | diff2 | blob | history
version.sh diff1 | diff2 | blob | history
FFmpeg git repo