• Michael Niedermayer's avatar
    Merge remote-tracking branch 'qatar/master' · d8cab5c2
    Michael Niedermayer authored
    * qatar/master:
      http: Remove the custom function for disabling chunked posts
      rtsp: Disable chunked http post through AVOptions
      movdec: Set frame_size for AMR
      h264_weight: remove duplication functions.
      swscale: align vertical filtersize by 2 on x86.
      libavfilter: reindent.
      matroskadec: empty blocks are in fact valid.
      avfilter: don't abort() on zero-size allocations.
      h264: improve calculation of codec delay.
      movenc: Set a correct packet size for AMR-NB mode 15, "no data"
      avformat: Add functions for doing global network initialization
      avformat: Add the https protocol
      avformat: Add the tls protocol, using OpenSSL or gnutls
      avformat: Initialize gnutls in ff_tls_init()
      w32threads: Wrap the mutex functions in inline functions returning int
      configure: Allow linking to the gnutls library
      avformat: Add ff_tls_init()/deinit() that initialize OpenSSL
      configure: Allow linking to openssl
      avcodec: Allow locking and unlocking an avformat specific mutex
      avformat: Split out functions from network.h to a new file, network.c
    
    Conflicts:
    	Changelog
    	configure
    	doc/APIchanges
    	libavcodec/internal.h
    	libavcodec/version.h
    	libavfilter/formats.c
    	libavformat/matroskadec.c
    	libavformat/mov.c
    	libavformat/version.h
    Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
    d8cab5c2
version.h 3.77 KB