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>

5 files changed, 7 insertions, 3 deletions

diff --git a/doc/APIchanges b/doc/APIchanges
index a31be4b0bf..c2415f0be8 100644
--- a/doc/APIchanges
+++ b/doc/APIchanges
@@ -16,6 +16,9 @@ API changes, most recent first:
 2011-10-20 - b35e9e1 - lavu 51.22.0
   Add av_strtok() to avstring.h.
 
+2011-10-xx - xxxxxxx - lavf 53.10.0
+  Add avformat_new_stream(). Deprecate av_new_stream().
+
 2011-xx-xx - xxxxxxx - lavf 53.9.0
   Add AVFMT_NO_BYTE_SEEK AVInputFormat flag.
 
diff --git a/doc/avconv.texi b/doc/avconv.texi
index 2b61dfba2d..056b9cd8db 100644
--- a/doc/avconv.texi
+++ b/doc/avconv.texi
@@ -778,7 +778,7 @@ A preset file contains a sequence of @var{option=value} pairs, one for
 each line, specifying a sequence of options which can be specified also on
 the command line. Lines starting with the hash ('#') character are ignored and
 are used to provide comments. Empty lines are also ignored. Check the
-@file{ffpresets} directory in the Libav source tree for examples.
+@file{presets} directory in the Libav source tree for examples.
 
 Preset files are specified with the @code{pre} option, this option takes a
 preset name as input.  Avconv searches for a file named @var{preset_name}.avpreset in
diff --git a/doc/examples/muxing.c b/doc/examples/muxing.c
index d681438bc1..0cdc895df8 100644
--- a/doc/examples/muxing.c
+++ b/doc/examples/muxing.c
@@ -199,7 +199,7 @@ static AVStream *add_video_stream(AVFormatContext *oc, enum CodecID codec_id)
     AVCodecContext *c;
     AVStream *st;
 
-    st = av_new_stream(oc, 0);
+    st = avformat_new_stream(oc, NULL);
     if (!st) {
         fprintf(stderr, "Could not alloc stream\n");
         exit(1);
diff --git a/doc/ffmpeg.texi b/doc/ffmpeg.texi
index 39fb27cd8a..c59c757535 100644
--- a/doc/ffmpeg.texi
+++ b/doc/ffmpeg.texi
@@ -873,7 +873,7 @@ A preset file contains a sequence of @var{option}=@var{value} pairs,
 one for each line, specifying a sequence of options which would be
 awkward to specify on the command line. Lines starting with the hash
 ('#') character are ignored and are used to provide comments. Check
-the @file{ffpresets} directory in the FFmpeg source tree for examples.
+the @file{presets} directory in the FFmpeg source tree for examples.
 
 Preset files are specified with the @code{vpre}, @code{apre},
 @code{spre}, and @code{fpre} options. The @code{fpre} option takes the
diff --git a/doc/general.texi b/doc/general.texi
index 65f9efe3d3..3ba3c58f47 100644
--- a/doc/general.texi
+++ b/doc/general.texi
@@ -527,6 +527,7 @@ following image formats are supported:
     @tab encoding supported through external library libtheora
 @item Tiertex Limited SEQ video  @tab     @tab  X
     @tab Codec used in DOS CD-ROM FlashBack game.
+@item Ut Video               @tab     @tab  X
 @item V210 Quicktime Uncompressed 4:2:2 10-bit     @tab  X  @tab  X
 @item VMware Screen Codec / VMware Video  @tab     @tab  X
     @tab Codec used in videos captured by VMware.