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

It is not possible to have a plugin[] array with 5 or more elements.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

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

Simplifies check and should fix lumi+vari warning
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

os_support.h contains more precise workarounds for non-POSIX mkdir().

The bitstream buffers are now private and freed by libavcodec. For
backward compatibility, the hold bitstream buffer pointer is left NULL
(applications were supposed to av_freep() it).
Signed-off-by: Anton Khirnov <anton@khirnov.net>

Signed-off-by: Anton Khirnov <anton@khirnov.net>

Signed-off-by: Anton Khirnov <anton@khirnov.net>

Signed-off-by: Anton Khirnov <anton@khirnov.net>

Signed-off-by: Anton Khirnov <anton@khirnov.net>

It limits the duration of the data read from a given input.

Insert (a)trim filters on the corresponding inputs, so the extra frames
are decoded and discarded.

Using -ss 0 to drop frames with negative timestamps is a perfectly valid
use case.

This will allow using the same code when one filter can be inserted both
on input and output.

If any samples are still buffered when request_frame returns EOF, they
won't be returned currently.

Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

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

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