* 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>

* commit '3799376d':
  lavfi/fifo: fix flushing when using request_samples

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

* commit '06cd4c5a':
  avconv: fix usage of deprecated lavfi API
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '612a5049':
  avserver: do not use a static string as a default for a string option

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

Changes since v1 of the patch:
- enable option by default
- add documentation
- move up PTS override code after PES header parsing, to ensure we use the
  last PCR before the first packet of the teletext PES packet.

The option overrides teletext packet PTS and DTS values with the timestamps
calculated from the PCR of the first program which the teletext stream is part
of and is not discarded.

Using the same teletext PID for multiple programs is possible, therefore we
need some kind of heuristics to know which program PCR we should synchronize
to. Using the first non-discarded PCR pid among the programs of the teletext
stream seemed like a good choice.

The patch does not do PCR interpolation to estimate the PCR of the teltetext
packet, it just uses the last PCR of the program, which may cause a slight
error (0.1 sec) in the teletext packet pts-es.

Based on a patch by Reimar Döffinger.
http://lists.ffmpeg.org/pipermail/ffmpeg-devel/2012-September/131610.htmlSigned-off-by: Marton Balint <cus@passwd.hu>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Fixes handling of lower case pcmu
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Signed-off-by: Diego Biurrun <diego@biurrun.de>

This is required for the future addition of VoxWare MetaSound decoder, for its
functions are mostly the same but bitstream reader is completely different
and bitstream format is slightly different too.
Signed-off-by: Diego Biurrun <diego@biurrun.de>

The common case of the pointer having increased by one packet (which results
in no change to the modulus) can be detected with a 64-bit subtraction,
which is far cheaper than a division on many platforms.

           Before          After
           Mean   StdDev   Mean   StdDev  Change
Divisions   248.3  8.8      51.5   7.4    +381.7%
Overall    2773.2 25.6     2372.5 43.1     +16.9%
Signed-off-by: Martin Storsjö <martin@martin.st>

Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org

Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org