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)
commit776fb2e10d4a4f0bc3fc6b46d1e74e358ec64556
treea4904a9affc839fca9da375098e2587c813846bc
parent09a278fdd13cfc16c151190051f362625595c06e
parent0dfcbe5285f04964f5de5e15a4bfbf83fb9fd082
Merge remote-tracking branch 'qatar/release/0.5' into release/0.5

* 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>