Merge remote-tracking branch 'qatar/release/0.6' into release/0.6
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 16 Oct 2012 15:59:55 +0000 (17:59 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 16 Oct 2012 16:00:02 +0000 (18:00 +0200)
commitf48d1fb167202cb1ccef29e067436024e7068792
tree064c76e4cb35357bb993a634f89b144151b3ee5a
parent79234907128390d775ceb1206dd0fed111a17896
parent0e2f415adf5d8c0e8bbb210c3c2693315854718f
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@gmx.at>