• Michael Niedermayer's avatar
    Merge remote-tracking branch 'qatar/master' · d0492578
    Michael Niedermayer authored
    * qatar/master:
      presets: rename presets directory
      lavc: make avcodec_get_context_defaults3 "officially" public
      lavf: replace av_new_stream->avformat_new_stream part II.
      lavf,lavd: replace av_new_stream->avformat_new_stream part I.
      lavf: add avformat_new_stream as a replacement for av_new_stream.
      Use correct scaling table for bwd-pred MVs in second B-field
      Ut Video decoder
      Makefile: change presets extension to .avpreset
      lavfi: add rgbtestsrc source, ported from MPlayer libmpcodecs
      lavfi: add testsrc source
      AVOptions: add documentation.
      presets: update libx264 ffpresets
    
    Conflicts:
    	Changelog
    	doc/APIchanges
    	doc/ffmpeg.texi
    	ffpresets/libx264-ipod320.ffpreset
    	ffpresets/libx264-ipod640.ffpreset
    	ffserver.c
    	libavcodec/avcodec.h
    	libavcodec/options.c
    	libavcodec/version.h
    	libavdevice/libdc1394.c
    	libavfilter/avfilter.h
    	libavfilter/vsrc_testsrc.c
    	libavformat/flvdec.c
    	libavformat/riff.c
    	libavformat/version.h
    	libavformat/wtv.c
    Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
    d0492578
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...