[FFmpeg-cvslog] Merge remote branch 'qatar/master'

Michael Niedermayer git at videolan.org
Thu Apr 21 03:40:33 CEST 2011


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Apr 21 03:23:46 2011 +0200| [10d2ae8cf78ed7e23c6342200fa4d8a5355e87f2] | committer: Michael Niedermayer

Merge remote branch 'qatar/master'

* qatar/master:
  Makefile: Include dependencies for test tools, too
  Remove a version check in av_log made unnecessary by the big bump.
  update last major version increase dates in APIchanges
  Reduce picture size for yadif.
  oggdec: use av_freep() instead of av_free()
  avio: Fix sanity checks in ffurl_read*
  libavformat: Free AVFormatContext->streams
  libavformat: Make protocols pass URLContext as log context where available
  asf: remove commented out code in asf_read_seek
not pulled:  libpostproc: Remove crufty code disabled by the big bump.
  Reflect 0.7_beta1 release in the Changelog
not pulled:  sws: remove disabled cruft.
  lavu: remove disabled ff_random_get_seed cruft.
  lavu: remove disabled sha1 cruft.

Conflicts:
	Changelog
	libavutil/sha1.h

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

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





More information about the ffmpeg-cvslog mailing list