* commit '8fed466b':
  h264_ps: Drop commented-out cruft
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'c4e43560':
  h264data: Move some tables to the only place they are used

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

* commit 'f34de148':
  h264data: Remove unused luma_dc_field_scan table
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '4f2b469d':
  Add a libfdk-aac decoder

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

* commit '545a0b80':
  vf_fps: add 'start_time' option

Conflicts:
	doc/filters.texi
	libavfilter/vf_fps.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '2a615925':
  avcodec: Remove some commented-out debug cruft

Conflicts:
	libavcodec/h264_cabac.c
	libavcodec/h264_cavlc.c
	libavcodec/h264_loopfilter.c
	libavcodec/h264_mvpred.h
	libavcodec/mjpegdec.c
	libavcodec/mjpegenc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '6c786765':
  movenc: Allow chapters to be written in trailer

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

* commit 'db03cb37':
  movenc: Allow chapter track in default MODE_MP4
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '64af59bc':
  avformat: Fix references to removed av_close_input_file in Doxygen
Merged-by: Michael Niedermayer <michaelni@gmx.at>

This should fix openbsd while hopefully also working on solaris & android
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

unbreak android ndk r8 build
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Fixes out of array accesses
Fixes Ticket2844

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

This can be useful for decoding AAC object types that are not supported
by the native AAC decoder, e.g. AAC-LD and AAC-ELD.

This allows for dropping or duplication to match a particular start time.

Fixes Ticket2859

Note, testcases related to the downmix channels are welcome.
(id like to make sure this is working correctly now, as obviously it didnt
 work before ...)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

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

This allows creation of frame accurate chapter marks from sources
like DVD and BD where the precise chapter location is not known until
the chapter mark has been reached during reading.
Signed-off-by: Martin Storsjö <martin@martin.st>

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

Without this the block_align or bitrate value is not available to the decoder

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

* qatar/master:
  mov: Prevent segfaults on mov_write_hdlr_tag

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

* commit '22de0f83':
  mov: Compute max duration among the tracks with a timescale
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '39523030':
  mov: Set the timescale for data streams

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

* commit 'b886f5c2':
  mkv: Allow flushing the current cluster in progress

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

* commit '59f59592':
  mkv: Flush the old cluster before writing a new one
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '98308bd4':
  mkv: Add options for specifying cluster limits

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

* commit '148fbdd1':
  mkv: Refactor mkv_write_packet

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

the version is 1.3.4 which makes 4 micro and not minor
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Do not segfault when writing tracks such as tmcd by writing them down
as generic DataHandlers if not known.

Prevent an assert.

Data streams have a defined timebase, do not ignore it.

Fixes strides and issue with mplayer and mpeg2 field pictures
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Allow emitting the current cluster that is being written before
starting a new one, simplifying how to figure out where clusters
are positioned in the output stream (for live streaming).
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>

This simplifies keeping track of cluster boundaries for e.g.
livestreaming of WebM.
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>