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>

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>

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>

WebM files now support inband text tracks, as described in the
following specification:

http://wiki.webmproject.org/webm-metadata/temporal-metadata/webvtt-in-webm

The Matroska demuxer now detects the presence of WebVTT tracks,
synthesizing WebVTT packets (having codec id AV_CODEC_ID_WEBVTT) and
pushing them downstream in the normal way.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Bssed on patch by Øyvind Kolås <pippin@gimp.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

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

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

This reverts commit 3aa2257d.

Signed-off-by: Paul B Mahol <onemda@gmail.com>

* qatar/master:
  ogg: Fix potential infinite discard loop

No change as this commit has been part of ffmpeg since a while already

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

Seeking in certain broken files would cause ogg_read_timestamp
to fail because ogg_packet would go into a state where all packets
of stream 1 would be discarded until the end of the stream.

Bug-Id: 553
CC: libav-stable@libav.org
Signed-off-by: Jan Gerber <j@v2v.cc>
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>

Fixes ticket #2864.

This avoids the loss of a packet in many cases if the packet size was wrong.
It also improves detection of packet size changes
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

This matches how read_packet() works
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

The value was off by a packet
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

No case is known to have triggered this, but its more correct to check that the
new size differs.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Fixes ticket #2870.

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

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

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

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