* commit '066ad249':
  h264_sei: reorder headers
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '304e916a':
  h264_sei: name buffering period type consistently
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '15210354':
  h264: drop outdated comments
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '3a057670':
  h264: store current_sps_id inside the current sps

Conflicts:
	libavcodec/h264.c
	libavcodec/h264_ps.c

The current_sps_id is not removed as it used in security related code.
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '73e8fab3':
  h264: print values in case of error

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

* commit 'f8c507f4':
  h264: Refactor ff_h264_decode_ref_pic_list_reordering
Merged-by: Michael Niedermayer <michaelni@gmx.at>

Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Also drop unused assert.h.

In preparation for MVC support.

Also make error style consistent and drop redundant information.

* qatar/master:
  mpeg12dec: do not add stereo3D side data to a non-existing frame

Conflicts:
	libavcodec/mpeg12dec.c

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

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

In preparation for MVC support.

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>

User data is usually coded before slice data. That means the frame
the user data belongs to is not available while parsing the user data.
The stereo3D side data has to use the same indirection over the private
context as pan scan information and A53 captions.

Bug-Id:632

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.