* commit 'f0a87479':
  rtp: h264: Move STAP-A NAL parsing to a function
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'a9a0b8d6':
  rtp: h264: Move parse_sprop_parameter_sets parsing to a function
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'b8df0b71':
  rtp: h264: Move profile_level_id parsing to a function
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'd40815a9':
  xcbgrab: Correctly make shm optional

Conflicts:
	libavdevice/xcbgrab.c

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

* commit 'c23ccaf9':
  xcbgrab: Check for xcb-shape

Conflicts:
	configure

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

* commit 'e21d8530':
  FATE: add a test for the SVQ1 header byte swapping

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

* commit 'd3449ac9':
  changelog: mention DXVA/HEVC and AAC ELD480

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

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

Tested with live555 RTSP server
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Signed-off-by: Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com>

Signed-off-by: Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com>

Signed-off-by: Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com>

Signed-off-by: Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com>

The segment field in the struct has to be conditionally build
as well.

It is required.

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

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

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

Signed-off-by: Anshul Maheshwari <er.anshul.maheshwari@gmail.com>

if input codec Id match with expected data stream of output format context
then only new stream with same codec id is created.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

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

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

This also allows replacing several literal numbers by named constants
And it should be faster, the function is not speed relevant though as it is
generally only called a few times at the streams start.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Based on complaint by wm4
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

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

* commit 'ecbcebde':
  vdpau: Adjust necessary #includes for vdpau_internal.h

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

* commit '36cf8eb4':
  mov: Fix compilation with DEBUG enabled

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

* commit '2a9c6fae':
  dca: Move all tables into dcadata.h

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

* commit '8a213179':
  dca: Remove trace debugging code
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'a96f51f2':
  dca: Return more informative error codes
Merged-by: Michael Niedermayer <michaelni@gmx.at>

Fixes "warning: DCA_SUBBANDS redefined"
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'b339019d':
  dca: Split code for handling the EXSS extension off into a separate file

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

* commit 'bf704132':
  Don't anonymously typedef structs

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

* commit '7f9f771e':
  avcodec: Don't anonymously typedef structs

Conflicts:
	libavcodec/alac.c
	libavcodec/cinepak.c
	libavcodec/cscd.c
	libavcodec/dcadec.c
	libavcodec/g723_1.c
	libavcodec/gif.c
	libavcodec/iff.c
	libavcodec/kgv1dec.c
	libavcodec/libopenjpegenc.c
	libavcodec/libspeexenc.c
	libavcodec/ra288.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'daf8cf35':
  avformat: Don't anonymously typedef structs

Conflicts:
	libavformat/adtsenc.c
	libavformat/aiffenc.c
	libavformat/avidec.c
	libavformat/gif.c
	libavformat/iff.c
	libavformat/img2dec.c
	libavformat/jvdec.c
	libavformat/matroskadec.c
	libavformat/udp.c
	libavformat/wtvdec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>