[FFmpeg-cvslog] Merge remote branch 'qatar/release/0.6' into release/0.6

[Michael Niedermayer]

ffmpeg | branch: release/0.6 | Michael Niedermayer <michaelni at gmx.at> | Mon May  2 03:16:18 2011 +0200| [701dd6eab0e9ad910073c9823319091ea20723dc] | committer: Michael Niedermayer

Merge remote branch 'qatar/release/0.6' into release/0.6

* qatar/release/0.6:
  Release notes for 0.6.3
  update Changelog
Duplicate  AMV: disable DR1 and don't override EMU_EDGE
  lavf: inspect more frames for fps when container time base is coarse
Duplicate  Fix races in default av_log handler
  aac: add headers needed for log2f()
  mjpeg: Detect overreads in mjpeg_decode_scan() and error out.

Conflicts:
	Changelog

Merged-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=701dd6eab0e9ad910073c9823319091ea20723dc
---