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

[Michael Niedermayer]

ffmpeg | branch: release/0.6 | Michael Niedermayer <michaelni at gmx.at> | Tue Oct 16 17:59:55 2012 +0200| [f48d1fb167202cb1ccef29e067436024e7068792] | committer: Michael Niedermayer

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

* qatar/release/0.6:
  vorbis: Validate that the floor 1 X values contain no duplicates.
  lavfi: avfilter_merge_formats: handle case where inputs are same
  mpegvideo: Don't use ff_mspel_motion() for vc1
  imgconvert: avoid undefined left shift in avcodec_find_best_pix_fmt
  nuv: check RTjpeg header for validity
  vc1dec: add flush function for WMV9 and VC-1 decoders
  mov: set AVCodecContext.width/height for h264
  h264: allow cropping to AVCodecContext.width/height

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

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