* commit 'd2617193':
  configure: do not link libraries against program-specific dependencies

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

* commit '60e6cecf':
  configure: avserver does not need $ldl

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

* commit '8a225034':
  jv: detect partial packets in the demuxer

Conflicts:
	libavformat/jvdec.c

See: 9d0c71e5
See: b948ab81Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'f795a8a8':
  h264: make context_count unsigned
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* lukaszmluki/master:
  lavd/opengl_enc: implement uncoded frame callback
  lavd/opengl_enc: add gray8/16 formats
Merged-by: Michael Niedermayer <michaelni@gmx.at>

Copy multiple languages data from PMT to extradata. New 5 bytes
per language extradata format.
Reviewed-by: Marton Balint <cus@passwd.hu>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>

Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

Tested on an AMD FX 6300

679081 decicycles in ff_flac_lpc_32_xop, 32768 runs
774425 decicycles in ff_flac_lpc_32_sse4, 32768 runs
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Support the cases where the first and last operand of
the XOP instruction are the same.

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

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

Prevents out of array writes
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

* restore multiple languages data from extradata to PMT table
* setting correctly hearing empaired subtitling type
Reviewed-by: Marton Balint <cus@passwd.hu>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Bug-Id: 635

This assumes the array is sufficiently padded with 0
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Signed-off-by: James Almer <jamrial@gmail.com>
Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

in case av_interleaved_write_uncoded_frame fails it seems
frame is freed for the second time in fail section.
Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>
Reviewed-by: Nicolas George <george@nsup.org>

This commit also removes 1 trailing whitespace as otherwise the push hook rejects it
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

* qatar/master:
  vp9: add a new segmentation sample.

Conflicts:
	tests/fate/vpx.mak
	tests/ref/fate/vp9-segmentation-aq-akiyo
	tests/ref/fate/vp9-segmentation-sf-akiyo

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

* commit '91be8df2':
  vp9: add fate sample for parallelmode.

Conflicts:
	tests/fate/vpx.mak
	tests/ref/fate/vp9-parallelmode-akiyo

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

Loadable plugins were removed in d010e95f.

* commit '50ea9315':
  Add libx265 encoder

Conflicts:
	Changelog
	LICENSE
	configure
	libavcodec/allcodecs.c
	libavcodec/libx265.c
	libavcodec/version.h

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

Fixes fate-jv under valgrind which reports a different CRC for the last
frame from a partial read.

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

* qatar/master:
  asfdec: fix seeking with fragmented packets
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '0c082565':
  asfdec: short-circuit seeking to the start of stream

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

* commit '0ebb523f':
  asfdec: check ff_get_guid() return values during seeking

Conflicts:
	libavformat/asfdec.c

The code that pretends that a truncated index is correct and complete is not merged
as it obviously would cause problems if a really truncated index is encountered
If someone has samples that work better with that hack, please share them / mail me

also the bug this apparently attempts to fix isnt reproducable before this in ffmpeg
Merged-by: Michael Niedermayer <michaelni@gmx.at>

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

Removes the bogus but scary looking warning 'libavcodec/h264.c:4529:49:
warning: array subscript is below array bounds [-Warray-bounds]'.

The old one didn't use segmentation. One uses segmentation in all frame
types (--aq-mode=1), and the other uses all segmentation features, but
only in inter frames (mbgraph).
Signed-off-by: Anton Khirnov <anton@khirnov.net>

This disables backward probability updates, which makes the codec more
friendly for frame-level multi-threading.
Signed-off-by: Anton Khirnov <anton@khirnov.net>

* commit '462d5e8e':
  aacdec: set AVFrame sample_rate

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

* commit '4a7d3837':
  buffersrc: Have function parameter names match between .c and .h file
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '25a1ba81':
  log: Have function parameter names match between .c and .h file

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

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>