* commit '8a26ae5f':
  mpjpeg: Check stream allocation
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'b08569a2':
  lavf: Replace the ASF demuxer

Conflicts:
	Changelog
	libavformat/asf.h
	libavformat/asfdec.c
	libavformat/version.h
	tests/ref/fate/wmv8-drm-nodec
	tests/ref/seek/lavf-asf

The rewritten demuxer is placed in a new file, the current demuxer is
left as default. Carl has tested both and the one working better is
default.
Merged-by: Michael Niedermayer <michaelni@gmx.at>

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

Theres no need to upload or use new files just because they are
shorter.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

* commit '441e8ae5':
  FATE: drop the last truncated frame from the wmapro tests
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'd3ea79e8':
  FATE: drop the last truncated frame from the wma lossless test

Conflicts:
	tests/fate/lossless-audio.mak
Merged-by: Michael Niedermayer <michaelni@gmx.at>

get_bits should not be used for more than 25 bits.
Reviewed-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>

Bug-Id: CID 1308152

The old one is the result of the reverse engineering and guesswork.
The new one has been written following the now-available specification.

This work is part of Outreach Program for Women Summer 2014 activities
for the Libav project.

The fate references had to be changed because the old demuxer truncates
the last frame in some cases, the new one handles it properly.
The seek-test reference is changed because seeking works differently
in the new demuxer. When seeking, the packet is not read from the stream
directly, but it is rather constructed by the demuxer. That is why
position is -1 now in the reference.
Signed-off-by: Anton Khirnov <anton@khirnov.net>

Since it's truncated, the result depends on how specifically the demuxer
and the decoder handle errors.

Since it's truncated, the result depends on how specifically the demuxer
and the decoder handle errors.

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

This should fix some problems on some fate clients like openbsd
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Fixes part of Ticket4680
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

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

Add check for linesize.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

This commit adds additional fields which are used by the native encoder to add intensity stereo support. It also adds some clarifying statements to the comments for the codebooks.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

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

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

If this assert fails there is very likely a bug in the code
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

* commit '5ec0bdf2':
  h264: do not update the context fields copied between threads after finish_setup()

Conflicts:
	libavcodec/h264.h
	libavcodec/h264_slice.c

See: f111831e and others
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '6d4d3fee':
  h264: make sure the current picture is not made a long ref multiple times

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

* commit '9a5e4fbe':
  avconv: do not stop processing the input packet on decoding error

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

* commit 'b114f6d4':
  avconv: factor out flushing the filters

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

Signed-off-by: James Almer <jamrial@gmail.com>

Otherwise sm_size can be larger than size, which results in a negative
packet size.
Reviewed-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>

* commit 'e49e0f58':
  h264: make sure the slices do not overlap during slice threading

Conflicts:
	libavcodec/h264.h
	libavcodec/h264_slice.c

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

Signed-off-by: Niklesh <niklesh.lalwani@iitb.ac.in>

* commit 'b56b12cd':
  configure: Check for x265_api_get

Conflicts:
	configure

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

Signed-off-by: James Almer <jamrial@gmail.com>

Should fix a large number of possible races with frame threading.

Fixes possible invalid reads, once one of those refs is freed, but the
others remain.
CC: libav-stable@libav.org

We still want to flush the filters on EOF and possibly apply streamcopy.

This also ensures this is always done, avoiding infinite loops if an
error occurs at the end of the input.

Based on a patch by Michael Niedermayer <michaelni@gmx.at>.
CC: libav-stable@libav.org
Found-by: Kieran Kunhya <kierank@obe.tv>

not just at the end
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

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

Any other x265 symbol may not exported, e.g. if the build is a
multilib (10-bit and 8-bit in one) build.

This is the only symbol we directly call, and is available in the
build number we check for.

Fixes the configure check on multilib x265 builds.
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

Any other x265 symbol may not exported, e.g. if the build is a
multilib (10-bit and 8-bit in one) build.

This is the only symbol we directly call, and is available in the
build number we check for.

Fixes the configure check on multilib x265 builds.
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

Fixes: Ticket4677

Solution based on information from
https://code.google.com/p/openjpeg/issues/detail?id=80Signed-off-by: Michael Niedermayer <michaelni@gmx.at>