Merge branch 'master' into oldabi
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 21 Jun 2011 19:13:49 +0000 (21:13 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 21 Jun 2011 19:14:36 +0000 (21:14 +0200)
* master:
  release_notes: document not fully understood mingw-sdl issue
  release_notes: some updates
  presets: forgotten libvpx presets
  release_notes: fix version
  release_notes: mention more codecs Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
  release_notes: there will be 2 releases each for one ABI/API.
  release_notes: suggest git log instead of the poorly maintained APIChanges
  release_notes: we do support releases
  build system: disable memalign on haiku, its not reliable there.
  ffprobe: remove duplicate avformat_alloc_context()
  Fix segmentation fault in ffprobe
  wma: fix infinite loop
  Fix H.264 4:4:4 lossless decoding.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
ffprobe.c
libavcodec/h264.c

diff --cc ffprobe.c
Simple merge
Simple merge