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>

35 files changed, 136 insertions, 0 deletions

diff --git a/presets/libvpx-1080p.ffpreset b/presets/libvpx-1080p.ffpreset
new file mode 100644
index 0000000000..5c7da6fb86
--- /dev/null
+++ b/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
diff --git a/presets/libvpx-1080p50_60.ffpreset b/presets/libvpx-1080p50_60.ffpreset
new file mode 100644
index 0000000000..d42f731744
--- /dev/null
+++ b/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
diff --git a/presets/libvpx-360p.ffpreset b/presets/libvpx-360p.ffpreset
new file mode 100644
index 0000000000..2cb9e380f3
--- /dev/null
+++ b/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
diff --git a/presets/libvpx-720p.ffpreset b/presets/libvpx-720p.ffpreset
new file mode 100644
index 0000000000..3c7e396ad6
--- /dev/null
+++ b/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
diff --git a/presets/libvpx-720p50_60.ffpreset b/presets/libvpx-720p50_60.ffpreset
new file mode 100644
index 0000000000..613930063e
--- /dev/null
+++ b/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
diff --git a/presets/libx264-baseline.ffpreset b/presets/libx264-baseline.ffpreset
new file mode 100644
index 0000000000..0626e28440
--- /dev/null
+++ b/presets/libx264-baseline.ffpreset
@@ -0,0 +1 @@
+profile=baseline
diff --git a/presets/libx264-fast.ffpreset b/presets/libx264-fast.ffpreset
new file mode 100644
index 0000000000..a8c526e8b4
--- /dev/null
+++ b/presets/libx264-fast.ffpreset
@@ -0,0 +1 @@
+preset=fast
diff --git a/presets/libx264-fast_firstpass.ffpreset b/presets/libx264-fast_firstpass.ffpreset
new file mode 100644
index 0000000000..d9cf5afe0e
--- /dev/null
+++ b/presets/libx264-fast_firstpass.ffpreset
@@ -0,0 +1,2 @@
+preset=fast
+fastfirstpass=1
diff --git a/presets/libx264-faster.ffpreset b/presets/libx264-faster.ffpreset
new file mode 100644
index 0000000000..e311989bbb
--- /dev/null
+++ b/presets/libx264-faster.ffpreset
@@ -0,0 +1 @@
+preset=faster
diff --git a/presets/libx264-faster_firstpass.ffpreset b/presets/libx264-faster_firstpass.ffpreset
new file mode 100644
index 0000000000..48a2d443bc
--- /dev/null
+++ b/presets/libx264-faster_firstpass.ffpreset
@@ -0,0 +1,2 @@
+preset=faster
+fastfirstpass=1
diff --git a/presets/libx264-ipod320.ffpreset b/presets/libx264-ipod320.ffpreset
new file mode 100644
index 0000000000..6323191740
--- /dev/null
+++ b/presets/libx264-ipod320.ffpreset
@@ -0,0 +1,4 @@
+profile=baseline
+level=13
+maxrate=768000
+bufsize=3000000
diff --git a/presets/libx264-ipod640.ffpreset b/presets/libx264-ipod640.ffpreset
new file mode 100644
index 0000000000..c2c3e1a88e
--- /dev/null
+++ b/presets/libx264-ipod640.ffpreset
@@ -0,0 +1,4 @@
+profile=baseline
+level=30
+maxrate=10000000
+bufsize=10000000
diff --git a/presets/libx264-lossless_fast.ffpreset b/presets/libx264-lossless_fast.ffpreset
new file mode 100644
index 0000000000..1658d563aa
--- /dev/null
+++ b/presets/libx264-lossless_fast.ffpreset
@@ -0,0 +1,2 @@
+preset=fast
+qp=0
diff --git a/presets/libx264-lossless_max.ffpreset b/presets/libx264-lossless_max.ffpreset
new file mode 100644
index 0000000000..c25ff32d16
--- /dev/null
+++ b/presets/libx264-lossless_max.ffpreset
@@ -0,0 +1,2 @@
+preset=placebo
+qp=0
diff --git a/presets/libx264-lossless_medium.ffpreset b/presets/libx264-lossless_medium.ffpreset
new file mode 100644
index 0000000000..f7b1d81f39
--- /dev/null
+++ b/presets/libx264-lossless_medium.ffpreset
@@ -0,0 +1,2 @@
+preset=medium
+qp=0
diff --git a/presets/libx264-lossless_slow.ffpreset b/presets/libx264-lossless_slow.ffpreset
new file mode 100644
index 0000000000..a15ff4c426
--- /dev/null
+++ b/presets/libx264-lossless_slow.ffpreset
@@ -0,0 +1,2 @@
+preset=slow
+qp=0
diff --git a/presets/libx264-lossless_slower.ffpreset b/presets/libx264-lossless_slower.ffpreset
new file mode 100644
index 0000000000..bd71f03291
--- /dev/null
+++ b/presets/libx264-lossless_slower.ffpreset
@@ -0,0 +1,2 @@
+preset=slower
+qp=0
diff --git a/presets/libx264-lossless_ultrafast.ffpreset b/presets/libx264-lossless_ultrafast.ffpreset
new file mode 100644
index 0000000000..4d71eb72aa
--- /dev/null
+++ b/presets/libx264-lossless_ultrafast.ffpreset
@@ -0,0 +1,2 @@
+preset=ultrafast
+qp=0
diff --git a/presets/libx264-main.ffpreset b/presets/libx264-main.ffpreset
new file mode 100644
index 0000000000..336c69b3af
--- /dev/null
+++ b/presets/libx264-main.ffpreset
@@ -0,0 +1 @@
+profile=main
diff --git a/presets/libx264-medium.ffpreset b/presets/libx264-medium.ffpreset
new file mode 100644
index 0000000000..261d584f95
--- /dev/null
+++ b/presets/libx264-medium.ffpreset
@@ -0,0 +1 @@
+preset=medium
diff --git a/presets/libx264-medium_firstpass.ffpreset b/presets/libx264-medium_firstpass.ffpreset
new file mode 100644
index 0000000000..06c8f9f8fb
--- /dev/null
+++ b/presets/libx264-medium_firstpass.ffpreset
@@ -0,0 +1,2 @@
+preset=medium
+fastfirstpass=1
diff --git a/presets/libx264-placebo.ffpreset b/presets/libx264-placebo.ffpreset
new file mode 100644
index 0000000000..93d721d004
--- /dev/null
+++ b/presets/libx264-placebo.ffpreset
@@ -0,0 +1 @@
+preset=placebo
diff --git a/presets/libx264-placebo_firstpass.ffpreset b/presets/libx264-placebo_firstpass.ffpreset
new file mode 100644
index 0000000000..c8099e50c7
--- /dev/null
+++ b/presets/libx264-placebo_firstpass.ffpreset
@@ -0,0 +1,2 @@
+preset=placebo
+fastfirstpass=1
diff --git a/presets/libx264-slow.ffpreset b/presets/libx264-slow.ffpreset
new file mode 100644
index 0000000000..85778ec8ba
--- /dev/null
+++ b/presets/libx264-slow.ffpreset
@@ -0,0 +1 @@
+preset=slow
diff --git a/presets/libx264-slow_firstpass.ffpreset b/presets/libx264-slow_firstpass.ffpreset
new file mode 100644
index 0000000000..9998bc95a2
--- /dev/null
+++ b/presets/libx264-slow_firstpass.ffpreset
@@ -0,0 +1,2 @@
+preset=slow
+fastfirstpass=1
diff --git a/presets/libx264-slower.ffpreset b/presets/libx264-slower.ffpreset
new file mode 100644
index 0000000000..87d69893f2
--- /dev/null
+++ b/presets/libx264-slower.ffpreset
@@ -0,0 +1 @@
+preset=slower
diff --git a/presets/libx264-slower_firstpass.ffpreset b/presets/libx264-slower_firstpass.ffpreset
new file mode 100644
index 0000000000..c798b82872
--- /dev/null
+++ b/presets/libx264-slower_firstpass.ffpreset
@@ -0,0 +1,2 @@
+preset=slower
+fastfirstpass=1
diff --git a/presets/libx264-superfast.ffpreset b/presets/libx264-superfast.ffpreset
new file mode 100644
index 0000000000..1c117ecf60
--- /dev/null
+++ b/presets/libx264-superfast.ffpreset
@@ -0,0 +1 @@
+preset=superfast
diff --git a/presets/libx264-superfast_firstpass.ffpreset b/presets/libx264-superfast_firstpass.ffpreset
new file mode 100644
index 0000000000..fc70e0970b
--- /dev/null
+++ b/presets/libx264-superfast_firstpass.ffpreset
@@ -0,0 +1,2 @@
+preset=superfast
+fastfirstpass=1
diff --git a/presets/libx264-ultrafast.ffpreset b/presets/libx264-ultrafast.ffpreset
new file mode 100644
index 0000000000..910330188f
--- /dev/null
+++ b/presets/libx264-ultrafast.ffpreset
@@ -0,0 +1 @@
+preset=ultrafast
diff --git a/presets/libx264-ultrafast_firstpass.ffpreset b/presets/libx264-ultrafast_firstpass.ffpreset
new file mode 100644
index 0000000000..e3aaa17a2e
--- /dev/null
+++ b/presets/libx264-ultrafast_firstpass.ffpreset
@@ -0,0 +1,2 @@
+preset=ultrafast
+fastfirstpass=1
diff --git a/presets/libx264-veryfast.ffpreset b/presets/libx264-veryfast.ffpreset
new file mode 100644
index 0000000000..fa49629b35
--- /dev/null
+++ b/presets/libx264-veryfast.ffpreset
@@ -0,0 +1 @@
+preset=veryfast
diff --git a/presets/libx264-veryfast_firstpass.ffpreset b/presets/libx264-veryfast_firstpass.ffpreset
new file mode 100644
index 0000000000..4909030551
--- /dev/null
+++ b/presets/libx264-veryfast_firstpass.ffpreset
@@ -0,0 +1,2 @@
+preset=veryfast
+fastfirstpass=1
diff --git a/presets/libx264-veryslow.ffpreset b/presets/libx264-veryslow.ffpreset
new file mode 100644
index 0000000000..7e01c8f5c1
--- /dev/null
+++ b/presets/libx264-veryslow.ffpreset
@@ -0,0 +1 @@
+preset=veryslow
diff --git a/presets/libx264-veryslow_firstpass.ffpreset b/presets/libx264-veryslow_firstpass.ffpreset
new file mode 100644
index 0000000000..daf5a8f4d5
--- /dev/null
+++ b/presets/libx264-veryslow_firstpass.ffpreset
@@ -0,0 +1,2 @@
+preset=veryslow
+fastfirstpass=1