• Michael Niedermayer's avatar
    Merge remote-tracking branch 'qatar/master' · e161b079
    Michael Niedermayer authored
    * qatar/master: (22 commits)
      configure: add check for w32threads to enable it automatically
      rtmp: do not hardcode invoke numbers
      cinepack: return non-generic errors
      fate-lavf-ts: use -mpegts_transport_stream_id option.
      Add an APIchanges entry and a minor bump for avio changes.
      avio: Mark the old interrupt callback mechanism as deprecated
      avplay: Set the new interrupt callback
      avconv: Set new interrupt callbacks for all AVFormatContexts, use avio_open2() everywhere
      cinepak: remove redundant coordinate checks
      cinepak: check strip_size
      cinepak, simplify, use AV_RB24()
      cinepak: simplify, use FFMIN()
      cinepak: Fix division by zero, ask for sample if encoded_buf_size is 0
      applehttp: Fix seeking in streams not starting at DTS=0
      http: Don't use the normal http proxy mechanism for https
      tls: Handle connection via a http proxy
      http: Reorder two code blocks
      http: Add a new protocol for opening connections via http proxies
      http: Split out the non-chunked buffer reading part from http_read
      segafilm: add support for raw videos
      ...
    
    Conflicts:
    	avconv.c
    	configure
    	doc/APIchanges
    	libavcodec/cinepak.c
    	libavformat/applehttp.c
    	libavformat/version.h
    	tests/lavf-regression.sh
    	tests/ref/lavf/ts
    Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
    e161b079
ffplay.c 104 KB