« Previous | Next » 

Revision d4d09329

IDd4d09329eef30787da699c7a397b00f6f96940bc
Parent a61bc91d, 0c68c804
Child f7f9e24d

Added by Michael Niedermayer about 9 years ago

Merge remote branch 'qatar/master'

  • qatar/master:
    lavf: bump minor and add an APIChanges entry for avformat cleanup
    lavf: get rid of ffm-specific stuff in avformat.h
    Not pulled: avio: deprecate av_protocol_next().
    avio: add a function for iterating though protocol names.
    lavf: rename a parameter of av_sdp_create from buff->buf
    lavf: rename avf_sdp_create to av_sdp_create.
    lavf: make av_guess_image2_codec internal
    avio: make URLProtocol internal.
    avio: make URLContext internal.
    lavf: mark av_pkt_dump(log) for remove on $next+1 bump.
    lavf: use designated initializers for all protocols
    applehttp: don't use deprecated url
    functions.
    avio: move two ff_udp_* functions from avio_internal to url.h
    asfdec: remove a forgotten declaration of nonexistent function
    avio: deprecate the typedef for URLInterruptCB

Merged-by: Michael Niedermayer <>

Files

  • added
  • modified
  • copied
  • renamed
  • deleted