• Michael Niedermayer's avatar
    Merge remote-tracking branch 'qatar/master' · 5f268ca5
    Michael Niedermayer authored
    * qatar/master:
      lavf: pass options from AVFormatContext to avio.
      avformat: Use avio_open2, pass the AVFormatContext interrupt_callback onwards
      avio: add avio_open2, taking an interrupt callback and options
      avio: add support for passing options to protocols.
      avio: add and use ffurl_protocol_next().
      avformat: Pass the interrupt callback on to chained muxers/demuxers
      avio: Add an AVIOInterruptCB parameter to ffurl_open/ffurl_alloc
      avformat: Use ff_check_interrupt
      avio: Add an internal utility function for checking the new interrupt callback
      avio: Add AVIOInterruptCB
      texi2html: remove stray \n
      doc: prettyfy the texi2html documentation
      swscale: handle unaligned buffers in yuv2plane1
    
    Conflicts:
    	libavformat/avformat.h
    	libavformat/avio.c
    	libavformat/mov.c
    Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
    5f268ca5
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...