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

Michael Niedermayer git at videolan.org
Tue Oct 16 18:17:36 CEST 2012


ffmpeg | branch: release/0.5 | Michael Niedermayer <michaelni at gmx.at> | Tue Oct 16 18:04:18 2012 +0200| [776fb2e10d4a4f0bc3fc6b46d1e74e358ec64556] | committer: Michael Niedermayer

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 at gmx.at>

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





More information about the ffmpeg-cvslog mailing list