« Previous | Next » 

Revision c88caa52

IDc88caa522c41cd4108d39d8dd98805e867606ae3
Parent db95e559, a2031251
Child d0df2934

Added by Michael Niedermayer over 9 years ago

Merge remote branch 'qatar/master'

  • qatar/master:
    proto: include os_support.h in network.h
    matroskaenc: don't write an empty Cues element.
    lavc: add a FF_API_REQUEST_CHANNELS deprecation macro
    avio: move extern url_interrupt_cb declaration from avio.h to url.h
    avio: make av_register_protocol2 internal.
    avio: avio_ prefix for url_set_interrupt_cb.
    avio: AVIO_ prefixes for URL_ open flags.
    proto: introduce listen option in tcp
    doc: clarify configure features
    proto: factor ff_network_wait_fd and use it on udp

Conflicts:
ffmpeg.c

Merged-by: Michael Niedermayer <>

Files

  • added
  • modified
  • copied
  • renamed
  • deleted