• 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
Name
Last commit
Last update
..
examples Loading commit data...
APIchanges Loading commit data...
Makefile Loading commit data...
RELEASE_NOTES Loading commit data...
avconv.texi Loading commit data...
avtools-common-opts.texi Loading commit data...
avutil.txt Loading commit data...
bitstream_filters.texi Loading commit data...
build_system.txt Loading commit data...
decoders.texi Loading commit data...
demuxers.texi Loading commit data...
developer.texi Loading commit data...
encoders.texi Loading commit data...
eval.texi Loading commit data...
faq.texi Loading commit data...
fate.txt Loading commit data...
ffmpeg-mt-authorship.txt Loading commit data...
ffmpeg.texi Loading commit data...
ffmpeg.txt Loading commit data...
ffplay.texi Loading commit data...
ffprobe.texi Loading commit data...
ffserver.conf Loading commit data...
ffserver.texi Loading commit data...
filters.texi Loading commit data...
general.texi Loading commit data...
git-howto.txt Loading commit data...
indevs.texi Loading commit data...
issue_tracker.txt Loading commit data...
libavfilter.texi Loading commit data...
metadata.texi Loading commit data...
multithreading.txt Loading commit data...
muxers.texi Loading commit data...
optimization.txt Loading commit data...
outdevs.texi Loading commit data...
protocols.texi Loading commit data...
rate_distortion.txt Loading commit data...
snow.txt Loading commit data...
soc.txt Loading commit data...
swresample.txt Loading commit data...
swscale.txt Loading commit data...
t2h.init Loading commit data...
tablegen.txt Loading commit data...
texi2pod.pl Loading commit data...
viterbi.txt Loading commit data...