Merge remote-tracking branch 'qatar/release/0.5' into release/0.5
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 16 Oct 2012 16:04:18 +0000 (18:04 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 16 Oct 2012 16:04:22 +0000 (18:04 +0200)
* qatar/release/0.5:
  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

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

Trivial merge