* commit '87efaa97':
  af_join: Set the output frame format

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

Fixes null pointer dereference
Fixes Ticket3812
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

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

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

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

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

Fixes a infinite loop
Fixes Ticket3804
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'fa14804c':
  flv: Index the audio stream

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

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

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

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

* commit '7ab551f9':
  h264: prevent theoretical infinite loop in SEI parsing

Conflicts:
	libavcodec/h264_sei.c

Not merged, as this would remove 2 bitstream compliance checks.
The specification does not allow the bitstream to end in the middle
of these variable length elements and we have no samples which
have such non compliant truncation either so its better to error
out. Which is simpler as well

This issue also has been fixed long ago
See: 9decfc17Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'b2e059a1':
  pixdesc: K&R formatting cosmetics

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

* commit '92a36a6b':
  pngdec: correctly indent macros

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

* commit '52269f48':
  Revert "vf_interlace: deprecate lowpass option"
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '4da8cdbb':
  tscc: Eliminate pointless variable indirections in decode_frame()

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

* commit '5735552f':
  pngenc: Drop pointless pointer cast in png_write_row()
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'a786c825':
  idct: Split off Xvid IDCT

Conflicts:
	libavcodec/Makefile
	libavcodec/mpeg4videodec.c
	libavcodec/x86/Makefile
	libavcodec/x86/idctdsp_init.c

This split is somewhat restructured leaving the xvid IDCT available
outside mpeg4 if manually selected.

The code also could not be merged unchanged as it conflicted with a
bugfix in FFmpeg
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '03c9f357':
  ppc: idctdsp: Immediately return if no AltiVec is available

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

And leverage the video index if the video is just disabled as wm4
did in an initial patch.

* commit '706208ef':
  fate: Split fate-pixdesc tests and dispatch them through Make

Conflicts:
	tests/fate-run.sh
	tests/ref/fate/filter-pixdesc
Merged-by: Michael Niedermayer <michaelni@gmx.at>

The first try failed to work with some build flags

The gcc version affected is very old and unmaintained AFAIK thus i made no
attempt to report this to the gcc developers.

The workaround is pushed as it may still affect users and does affect one
fate client
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Properly address CVE-2011-3946 and parse bitstream as described in the spec.

CC: libav-stable@libav.org
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind

Also change some comments to multiline.
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>

This reverts commit 35b05c51.
A warning is introduced in case this option is used.

Update some git hashes.

In order not to break a sequence like "SPS IDR SPS IDR", the boolean
telling that the SPS/PPS has been seen should always be set.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

source index, as well as dest one, is unconditionnaly set afterwards,
before being effectively used.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

The Xvid IDCT is only required to decode some Xvid-encoded MPEG-4 files,
so there is no point in having it as an unconditional part of idctdsp.

This is how all the other init functions operate.

This allows running all the tests individually and/or in parallel.

* commit 'd98e6c5d':
  pgssubdec: Check RLE size before copying

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

Make sure the buffer size does not exceed the expected
RLE size.

Prevent an out of array bound write.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Bug-Id: CVE-2013-0852
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>

For x11grab, libcdio, and libdc1394 input devices.
Signed-off-by: Lou Logan <lou@lrcd.com>

Cosmetic change. No measurable difference in speed.
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>