Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 20 Oct 2011 00:23:36 +0000 (02:23 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 20 Oct 2011 00:34:51 +0000 (02:34 +0200)
commitd0492578c805cfd41673aa2cdadf52efde40e307
tree14fa2c0efa9f3a2c16d946cad36bc10edf0b39f6
parent9ef714328c9527f67be193a120821048b1fe86b5
parent8096fdf0b6886305ea1a8cb2c869ab2732cd8e11
Merge remote-tracking branch 'qatar/master'

* 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: Michael Niedermayer <michaelni@gmx.at>
178 files changed:
Changelog
Makefile
avconv.c
doc/APIchanges
doc/avconv.texi
doc/examples/muxing.c
doc/ffmpeg.texi
doc/general.texi
ffmpeg.c
ffserver.c
libavcodec/Makefile
libavcodec/allcodecs.c
libavcodec/avcodec.h
libavcodec/options.c
libavcodec/vc1dec.c
libavcodec/version.h
libavdevice/alsa-audio-dec.c
libavdevice/bktr.c
libavdevice/fbdev.c
libavdevice/jack_audio.c
libavdevice/libcdio.c
libavdevice/libdc1394.c
libavdevice/oss_audio.c
libavdevice/sndio_dec.c
libavdevice/v4l.c
libavdevice/v4l2.c
libavdevice/vfwcap.c
libavdevice/x11grab.c
libavfilter/avfilter.h
libavfilter/vsrc_testsrc.c
libavformat/4xm.c
libavformat/aacdec.c
libavformat/aea.c
libavformat/aiffdec.c
libavformat/amr.c
libavformat/anm.c
libavformat/apc.c
libavformat/ape.c
libavformat/applehttp.c
libavformat/asfdec.c
libavformat/assdec.c
libavformat/au.c
libavformat/avformat.h
libavformat/avidec.c
libavformat/avisynth.c
libavformat/avs.c
libavformat/bethsoftvid.c
libavformat/bfi.c
libavformat/bink.c
libavformat/c93.c
libavformat/cafdec.c
libavformat/cdg.c
libavformat/daud.c
libavformat/dfa.c
libavformat/dsicin.c
libavformat/dv.c
libavformat/dxa.c
libavformat/eacdata.c
libavformat/electronicarts.c
libavformat/ffmdec.c
libavformat/ffmetadec.c
libavformat/filmstripdec.c
libavformat/flacdec.c
libavformat/flic.c
libavformat/flvdec.c
libavformat/gxf.c
libavformat/idcin.c
libavformat/idroqdec.c
libavformat/iff.c
libavformat/img2.c
libavformat/ipmovie.c
libavformat/iss.c
libavformat/iv8.c
libavformat/ivfdec.c
libavformat/jvdec.c
libavformat/libnut.c
libavformat/lmlm4.c
libavformat/lxfdec.c
libavformat/matroskadec.c
libavformat/mm.c
libavformat/mmf.c
libavformat/mov.c
libavformat/mp3dec.c
libavformat/mpc.c
libavformat/mpc8.c
libavformat/mpeg.c
libavformat/mpegts.c
libavformat/msnwc_tcp.c
libavformat/mtv.c
libavformat/mvi.c
libavformat/mxfdec.c
libavformat/mxg.c
libavformat/ncdec.c
libavformat/nsvdec.c
libavformat/nutdec.c
libavformat/nuv.c
libavformat/oggdec.c
libavformat/oma.c
libavformat/psxstr.c
libavformat/pva.c
libavformat/qcp.c
libavformat/r3d.c
libavformat/rawdec.c
libavformat/rdt.c
libavformat/riff.c
libavformat/rl2.c
libavformat/rmdec.c
libavformat/rpl.c
libavformat/rsodec.c
libavformat/rtpenc_chain.c
libavformat/rtsp.c
libavformat/sapdec.c
libavformat/segafilm.c
libavformat/sierravmd.c
libavformat/siff.c
libavformat/smacker.c
libavformat/sol.c
libavformat/soxdec.c
libavformat/spdifdec.c
libavformat/srtdec.c
libavformat/swfdec.c
libavformat/thp.c
libavformat/tiertexseq.c
libavformat/tmv.c
libavformat/tta.c
libavformat/tty.c
libavformat/txd.c
libavformat/utils.c
libavformat/vc1test.c
libavformat/version.h
libavformat/vocdec.c
libavformat/vqf.c
libavformat/wav.c
libavformat/wc3movie.c
libavformat/westwood.c
libavformat/wtvdec.c
libavformat/wv.c
libavformat/xa.c
libavformat/xmv.c
libavformat/xwma.c
libavformat/yop.c
libavformat/yuv4mpeg.c
libavutil/opt.h
presets/libvpx-1080p.ffpreset
presets/libvpx-1080p50_60.ffpreset
presets/libvpx-360p.ffpreset
presets/libvpx-720p.ffpreset
presets/libvpx-720p50_60.ffpreset
presets/libx264-baseline.ffpreset
presets/libx264-fast.ffpreset
presets/libx264-fast_firstpass.ffpreset
presets/libx264-faster.ffpreset
presets/libx264-faster_firstpass.ffpreset
presets/libx264-ipod320.ffpreset
presets/libx264-ipod640.ffpreset
presets/libx264-lossless_fast.ffpreset
presets/libx264-lossless_max.ffpreset
presets/libx264-lossless_medium.ffpreset
presets/libx264-lossless_slow.ffpreset
presets/libx264-lossless_slower.ffpreset
presets/libx264-lossless_ultrafast.ffpreset
presets/libx264-main.ffpreset
presets/libx264-medium.ffpreset
presets/libx264-medium_firstpass.ffpreset
presets/libx264-placebo.ffpreset
presets/libx264-placebo_firstpass.ffpreset
presets/libx264-slow.ffpreset
presets/libx264-slow_firstpass.ffpreset
presets/libx264-slower.ffpreset
presets/libx264-slower_firstpass.ffpreset
presets/libx264-superfast.ffpreset
presets/libx264-superfast_firstpass.ffpreset
presets/libx264-ultrafast.ffpreset
presets/libx264-ultrafast_firstpass.ffpreset
presets/libx264-veryfast.ffpreset
presets/libx264-veryfast_firstpass.ffpreset
presets/libx264-veryslow.ffpreset
presets/libx264-veryslow_firstpass.ffpreset