• Michael Niedermayer's avatar
    Merge remote-tracking branch 'qatar/master' · 9e89bc37
    Michael Niedermayer authored
    * qatar/master:
      rtmp: Add support for SWFVerification
      api-example: use new video encoding API.
      x86: avcodec: Appropriately name files containing only init functions
      mpegvideo_mmx_template: drop some commented-out cruft
      libavresample: add mix level normalization option
      w32pthreads: Add missing #includes to make header compile standalone
      rtmp: Gracefully ignore _checkbw errors by tracking them
      rtmp: Do not send _checkbw calls as notifications
      prores: interlaced ProRes encoding
    
    Conflicts:
    	doc/examples/decoding_encoding.c
    	libavcodec/proresenc_kostya.c
    	libavcodec/w32pthreads.h
    	libavcodec/x86/Makefile
    	libavformat/version.h
    Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
    9e89bc37
Name
Last commit
Last update
..
doxy Loading commit data...
examples Loading commit data...
APIchanges Loading commit data...
Makefile Loading commit data...
RELEASE_NOTES 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...
errno.txt Loading commit data...
eval.texi Loading commit data...
faq.texi Loading commit data...
fate.texi Loading commit data...
ffmpeg.texi Loading commit data...
ffmpeg.txt Loading commit data...
ffplay.texi Loading commit data...
ffprobe.texi Loading commit data...
ffprobe.xsd Loading commit data...
ffserver.conf Loading commit data...
ffserver.texi Loading commit data...
filter_design.txt Loading commit data...
filters.texi Loading commit data...
general.texi Loading commit data...
git-howto.texi Loading commit data...
git-howto.txt Loading commit data...
indevs.texi Loading commit data...
issue_tracker.txt Loading commit data...
metadata.texi Loading commit data...
mips.txt Loading commit data...
multithreading.txt Loading commit data...
muxers.texi Loading commit data...
optimization.txt Loading commit data...
outdevs.texi Loading commit data...
platform.texi Loading commit data...
print_options.c 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...
syntax.texi Loading commit data...
t2h.init Loading commit data...
tablegen.txt Loading commit data...
texi2pod.pl Loading commit data...
viterbi.txt Loading commit data...