« Previous | Next » 

Revision 10d2ae8c

ID10d2ae8cf78ed7e23c6342200fa4d8a5355e87f2
Parent 2c18893a, f83acb09
Child 6d635148

Added by Michael Niedermayer over 9 years ago

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

Files

  • added
  • modified
  • copied
  • renamed
  • deleted