* commit '255d9c57':
  riff: Move demuxing code to a separate file.

Conflicts:
	configure
	libavformat/riff.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '3dd5c95d':
  riff: Move muxing code to a separate file

Conflicts:
	configure
	libavformat/riff.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'fcc455ff':
  avformat/dv: K&R formatting cosmetics

Conflicts:
	libavformat/dv.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'abe5268c':
  tcp: Use a different log message and level if there's more addresses to try

Conflicts:
	libavformat/tcp.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '2a0ec47b':
  unix: Convert from AVERROR to errno range before comparing error codes
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* qatar/master:
  avcodec/options: Drop deprecation warning suppression macros
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '971cce7e':
  riff.h: Remove stray extern declaration for non-existing symbol
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '86f4c59b':
  twinvq: Split VQF-specific part from common TwinVQ decoder core

Conflicts:
	libavcodec/Makefile
	libavcodec/twinvq.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '4d8d16b5':
  twinvq: Prefix enums and defines shared with VoxWare MetaSound
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'bc909626':
  twinvq: move all bitstream reading into single place
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'a22ae9f0':
  mpegts: Remove one 64-bit integer modulus operation per packet
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '43bacd5b':
  vc1: check mb_height validity.

See: b5f4836fMerged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '090cd063':
  vc1: check the source buffer in vc1_mc functions

Conflicts:
	libavcodec/vc1dec.c

See: 3a04c18dMerged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '9991298f':
  bink: Bound check the quantization matrix.

See: e70144cbMerged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'bb937825':
  network: Use SOCK_CLOEXEC when available
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '60538758':
  lavf: Support unix sockets

Conflicts:
	configure
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'bc54c2ae':
  libx264: add shortcut for the bluray compatibility option

Conflicts:
	doc/encoders.texi
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'c84ea750':
  mpegts: Make discard_pid() faster for single-program streams
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'cabb1681':
  mpegts: Remove one memcpy per packet

Conflicts:
	libavformat/mpegts.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'daf1e0d3':
  avio: Add an internal function for reading without copying
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '22a154e4':
  build: Add missing img2.o dependency to apetag.o
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'bea3d6f4':
  ismindex: Replace mkdir ifdeffery by os_support.h #include
Merged-by: Michael Niedermayer <michaelni@gmx.at>

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

Similar to 50fb8c11Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'f824535a':
  vdpau: deprecate bitstream buffers within the hardware context

Conflicts:
	libavcodec/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '2852740e':
  vdpau: store picture data in picture's rather than codec's context
Merged-by: Michael Niedermayer <michaelni@gmx.at>

Prevent build failure for applicatins using the old API
This could be replaced be a include of version.h but some applications
would then need extern C wrapers
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

* commit '549294fb':
  vdpau: deprecate VDPAU codec capability

Conflicts:
	libavcodec/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'a0ad5d01':
  vdpau: deprecate old codec-specific pixel formats

Conflicts:
	libavutil/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '578ea75a':
  vdpau: remove old-style decoders

Conflicts:
	libavcodec/allcodecs.c
	libavcodec/h263dec.c
	libavcodec/h264.c
	libavcodec/mpeg12dec.c
	libavcodec/mpeg4videodec.c
	libavcodec/vc1dec.c
	libavcodec/vdpau.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '488a0fa6':
  avconv: support -t as an input option.

Conflicts:
	Changelog
	ffmpeg.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>

This would otherwise conflict with the semantics of using -t for the input
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

* commit '811bd078':
  avconv: make input -ss accurate when transcoding

Conflicts:
	Changelog
	doc/ffmpeg.texi
	ffmpeg.h
	ffmpeg_filter.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '56ee3f9d':
  avconv: distinguish between -ss 0 and -ss not being used

Conflicts:
	ffmpeg.c
	ffmpeg_opt.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '2e661f26':
  avconv: insert extra filters in the same way for both graph inputs and outputs

Conflicts:
	ffmpeg_filter.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>

This lowers the level of warnings printed if trying to connect
to a host name that provides both v6 and v4 addresses but the
service only is available on the v4 address (often occurring for
'localhost', with servers that aren't v6-aware).
Signed-off-by: Martin Storsjö <martin@martin.st>

Signed-off-by: Martin Storsjö <martin@martin.st>