Author of the fix is ronald, the enabling & commit message are mine.

This fixes
	commit 4e3e333a
	Author: Ronald S. Bultje <rsbultje@gmail.com>
	Date:   Tue Jul 5 12:49:11 2011 -0700

	    swscale: error dithering for 16/9/10-bit to 8-bit.

	    Based on a somewhat similar idea in FFmpeg's swscale copy.

The Fix was originally commited in: (and i missed it due to the commit message)
	commit 5c391a16
	Author: Ronald S. Bultje <rsbultje@gmail.com>
	Date:   Fri Jul 8 14:39:04 2011 -0700

	    swscale: rename uv_off/uv_off2 to uv_off_px/byte.

modern OS should have localtime_r() or return thread locals on localtime() hopefully
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

* qatar/master:
  lavc: fix type for thread_type option
  avconv: move format to options context
  avconv: move limit_filesize to options context
  avconv: move start_time, recording_time and input_ts_offset to options context
  avconv: add a context for options.
  cmdutils: allow storing per-stream/chapter/.... options in a generic way
  cmdutils: split per-option code out of parse_options().
  cmdutils: add support for caller-provided option context.
  cmdutils: declare only one pointer type in OptionDef
  cmdutils: move grow_array() from avconv to cmdutils.
  cmdutils: move exit_program() declaration to cmdutils from avconv
  http: Consider the stream as seekable if the reply contains Accept-Ranges: bytes
  nutenc: add namespace to the api facing functions

Conflicts:
	avconv.c
	cmdutils.c
	cmdutils.h
	ffmpeg.c
	ffplay.c
	ffprobe.c
	ffserver.c
	libavformat/http.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Ignore resolution change if resolution not defined in extradata.
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>

It should be flags, not int.

Move stream maps to it.

Eventually all non-global options should be stored in it.

This allows options like -target, which are just shortcuts for other
options, to work without dummy function for all options they invoke.

This is the first step to removing the globals plague from avtools.

This will be useful in the following commit.

Allows cmdutils to call each tool's own cleanup function.

The initial request contains "Range: 0-", which servers normally
have responded with "HTTP/1.1 206 Partial Content" reply with
a Content-Range header, which was used as indicator for seekability.

Apache, since 2.2.20, responds with "HTTP/1.1 200 OK" for these
requests, which is more friendly to caches and proxies, but the
seekability still is indicated via the Accept-Ranges: bytes header.
Signed-off-by: Martin Storsjö <martin@martin.st>

Rename write_{header,packet,trailer} to nut_write_{header,packet,trailer}
in order to make easier debugging them.

* qatar/master:
  AVOptions: fix av_set_string3() doxy to match reality.
  cmdutils: get rid of dummy contexts for examining AVOptions.
  lavf,lavc,sws: add {avcodec,avformat,sws}_get_class() functions.
  AVOptions: add AV_OPT_SEARCH_FAKE_OBJ flag for av_opt_find().
  cpu detection: avoid a signed overflow

Conflicts:
	avconv.c
	cmdutils.c
	doc/APIchanges
	ffmpeg.c
	libavcodec/options.c
	libavcodec/version.h
	libavformat/version.h
	libavutil/avutil.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>

Based on code by Rolf Siegrist
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

currently libavformat only allows seeking if a request with "Range:
0-" results in a 206 reply from the HTTP server which includes a
Content-Range header. But according to RFC 2616, the server may also
reply with a normal 200 reply (which is more efficient for a request
for the whole file). In fact Apache HTTPD 2.2.20 has changed the
behaviour in this way and it looks like this change will be kept in
future versions. The fix for libavformat is easy: Also look at the
Accept-Ranges header.

Fixes bug 28.

Replace it with newly introduced libavutil API.

It allows to search for options only with AVClass, without allocating
the corresponding context.

1<<31 overflows because 1 is signed, so force it to unsigned.
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>

* qatar/master:
  codec-regression: force vsync 0 on the me_threshold test to make sure frames match.
Merged-by: Michael Niedermayer <michaelni@gmx.at>

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Needed by libvpx

This reverts commit a0147957.

  Transforms the loose enumeration of issues that was to far below
in the text into a more verbose paragraph at the top. The new text
also mentions the possibility to propose new types of issues to
track on the development mailing list.
Signed-off-by: Alexander Strasser <eclipse7@gmx.net>

  This change makes the first part of the file easier to read quickly.
It makes it also easier to spot the URLs which might be one of the main
interests of many readers.
Signed-off-by: Alexander Strasser <eclipse7@gmx.net>

  Correct a few grammar and spelling errors. Also improve consistency
by always referring to substatus (not substate).
Signed-off-by: Alexander Strasser <eclipse7@gmx.net>

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Fixes Ticket427
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Found-by: Ramiro
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Fixes Ticket159
If someone knows of a cleaner way to detect this, patch is welcome.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Revert "mjpeg: treat external huffman table setup failure as codec init failure if external huffman table use requested"
This broke mplayer

This reverts commit a18e04bc.