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>

presets/libvpx-1080p.ffpreset

@@ -0,0 +1,17 @@
+g=120
+lag-in-frames=16
+deadline=good
+cpu-used=0
+profile=1
+qmax=51
+qmin=11
+slices=4
+b=2M
+
+#ignored unless using -pass 2
+maxrate=24M
+minrate=100k
+auto-alt-ref=1
+arnr-maxframes=7
+arnr-strength=5
+arnr-type=centered

presets/libvpx-1080p50_60.ffpreset

@@ -0,0 +1,17 @@
+g=120
+lag-in-frames=25
+deafline=good
+cpu-used=0
+profile=1
+qmax=51
+qmin=11
+slices=4
+b=2M
+
+#ignored unless using -pass 2
+maxrate=24M
+minrate=100k
+auto-alt-ref=1
+arnr-maxframes=7
+arnr-strength=5
+arnr-type=centered

presets/libvpx-360p.ffpreset

@@ -0,0 +1,16 @@
+g=120
+lag-in-frames=16
+deadline=good
+cpu-used=0
+profile=0
+qmax=63
+qmin=0
+b=768k
+
+#ignored unless using -pass 2
+maxrate=1.5M
+minrate=40k
+auto-alt-ref=1
+arnr-maxframes=7
+arnr-strength=5
+arnr-type=centered

presets/libvpx-720p.ffpreset

@@ -0,0 +1,17 @@
+g=120
+lag-in-frames=16
+deadline=good
+cpu-used=0
+profile=0
+qmax=51
+qmin=11
+slices=4
+b=2M
+
+#ignored unless using -pass 2
+maxrate=24M
+minrate=100k
+auto-alt-ref=1
+arnr-maxframes=7
+arnr-strength=5
+arnr-type=centered

presets/libvpx-720p50_60.ffpreset

@@ -0,0 +1,17 @@
+g=120
+lag-in-frames=25
+deadline=good
+cpu-used=0
+profile=0
+qmax=51
+qmin=11
+slices=4
+b=2M
+
+#ignored unless using -pass 2
+maxrate=24M
+minrate=100k
+auto-alt-ref=1
+arnr-maxframes=7
+arnr-strength=5
+arnr-type=centered

presets/libx264-baseline.ffpreset

@@ -0,0 +1 @@
+profile=baseline

presets/libx264-fast.ffpreset

@@ -0,0 +1 @@
+preset=fast

presets/libx264-fast_firstpass.ffpreset

@@ -0,0 +1,2 @@
+preset=fast
+fastfirstpass=1

presets/libx264-faster.ffpreset

@@ -0,0 +1 @@
+preset=faster

presets/libx264-faster_firstpass.ffpreset

@@ -0,0 +1,2 @@
+preset=faster
+fastfirstpass=1

presets/libx264-ipod320.ffpreset

@@ -0,0 +1,4 @@
+profile=baseline
+level=13
+maxrate=768000
+bufsize=3000000

presets/libx264-ipod640.ffpreset

@@ -0,0 +1,4 @@
+profile=baseline
+level=30
+maxrate=10000000
+bufsize=10000000

presets/libx264-lossless_fast.ffpreset

@@ -0,0 +1,2 @@
+preset=fast
+qp=0

presets/libx264-lossless_max.ffpreset

@@ -0,0 +1,2 @@
+preset=placebo
+qp=0

presets/libx264-lossless_medium.ffpreset

@@ -0,0 +1,2 @@
+preset=medium
+qp=0

presets/libx264-lossless_slow.ffpreset

@@ -0,0 +1,2 @@
+preset=slow
+qp=0

presets/libx264-lossless_slower.ffpreset

@@ -0,0 +1,2 @@
+preset=slower
+qp=0

presets/libx264-lossless_ultrafast.ffpreset

@@ -0,0 +1,2 @@
+preset=ultrafast
+qp=0

presets/libx264-main.ffpreset

@@ -0,0 +1 @@
+profile=main

presets/libx264-medium.ffpreset

@@ -0,0 +1 @@
+preset=medium

presets/libx264-medium_firstpass.ffpreset

@@ -0,0 +1,2 @@
+preset=medium
+fastfirstpass=1

presets/libx264-placebo.ffpreset

@@ -0,0 +1 @@
+preset=placebo

presets/libx264-placebo_firstpass.ffpreset

@@ -0,0 +1,2 @@
+preset=placebo
+fastfirstpass=1

presets/libx264-slow.ffpreset

@@ -0,0 +1 @@
+preset=slow

presets/libx264-slow_firstpass.ffpreset

@@ -0,0 +1,2 @@
+preset=slow
+fastfirstpass=1

presets/libx264-slower.ffpreset

@@ -0,0 +1 @@
+preset=slower

presets/libx264-slower_firstpass.ffpreset

@@ -0,0 +1,2 @@
+preset=slower
+fastfirstpass=1

presets/libx264-superfast.ffpreset

@@ -0,0 +1 @@
+preset=superfast

presets/libx264-superfast_firstpass.ffpreset

@@ -0,0 +1,2 @@
+preset=superfast
+fastfirstpass=1

presets/libx264-ultrafast.ffpreset

@@ -0,0 +1 @@
+preset=ultrafast

presets/libx264-ultrafast_firstpass.ffpreset

@@ -0,0 +1,2 @@
+preset=ultrafast
+fastfirstpass=1

presets/libx264-veryfast.ffpreset

@@ -0,0 +1 @@
+preset=veryfast

presets/libx264-veryfast_firstpass.ffpreset

@@ -0,0 +1,2 @@
+preset=veryfast
+fastfirstpass=1

presets/libx264-veryslow.ffpreset

@@ -0,0 +1 @@
+preset=veryslow

presets/libx264-veryslow_firstpass.ffpreset

@@ -0,0 +1,2 @@
+preset=veryslow
+fastfirstpass=1