[FFmpeg-cvslog] Merge remote-tracking branch 'cehoyos/master'

Michael Niedermayer git at videolan.org
Mon Jun 29 17:41:01 CEST 2015


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Jun 29 17:29:13 2015 +0200| [e55e5be982a6d2429e9fc3516683da4c30b179f4] | committer: Michael Niedermayer

Merge remote-tracking branch 'cehoyos/master'

* cehoyos/master:
  lavf/msnwc: Return 0 if the probe function does not detect msnwc-tcp.
  lavf/mpegts: Return 0 if the probe function does not detect mpegts.
  lavf/img2dec: Improve detection of valid Quickdraw images.
  lavf/asfdec: Reduce minimum header size.
  Changelog: Add jpeg 2000 improvements before they get forgotten.
  lavf/img2dec: Autodetect dds frames.

Conflicts:
	libavformat/version.h

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

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





More information about the ffmpeg-cvslog mailing list