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

* commit 'eda7571e':
  wmv2: K&R formatting cosmetics

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

* commit '7a1d6ddd':
  xvid: Add C IDCT

Conflicts:
	libavcodec/dct-test.c
	libavcodec/xvididct.c

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

* commit '95c0cec0':
  idctdsp: Add global function pointers for {add|put}_pixels_clamped functions

Conflicts:
	libavcodec/arm/idctdsp_init_arm.c
	libavcodec/dct.h
	libavcodec/idctdsp.c
	libavcodec/jrevdct.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>

Signed-off-by: Diego Biurrun <diego@biurrun.de>

Thanks to Pascal Massimino and Michael Militzer for relicensing as LGPL.
Signed-off-by: Diego Biurrun <diego@biurrun.de>

These function pointers already existed in the ARM code. Adding them globally
allows calls to the function pointers to access arch-optimized versions of the
functions transparently.

* commit '91d30579':
  get_bits: Rename HAVE_BITS_REMAINING --> BITS_AVAILABLE

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

* commit 'ff4d1aa8':
  flv: K&R formatting cosmetics

Conflicts:
	libavcodec/flv.h
	libavcodec/flvdec.c
	libavcodec/flvenc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'f61e47dd':
  asv: K&R formatting cosmetics

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

* commit '74512f7e':
  8svx: Return proper error codes

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

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>

Adds some more whitespace between channel layout name and decomposition.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Fixes reading from freed data
Fixes part of Ticket3539
Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

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

The HAVE_ prefix is reserved for macros set by configure.

Signed-off-by: Diego Biurrun <diego@biurrun.de>

Signed-off-by: Diego Biurrun <diego@biurrun.de>

Signed-off-by: Diego Biurrun <diego@biurrun.de>

To get mpegts metadata copied when segmenting.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

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

This avoids having to assign oformat, allows returning the
correct error code and allocates priv_data

Based on patch by: Mika Raento <mika.raento@elisa.fi>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Fixes ticket #3916.

Fixes wrong number of segments output and undefined memory access.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'e48d1ea5':
  ismindex: improve diagnostics

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

This improves error messages for completely and somewhat broken inputs.
Signed-off-by: Martin Storsjö <martin@martin.st>

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 'e205fe68':
  mpeg4videodec: Fix low_delay error message
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '63f800ca':
  aac_adtstoasc_bsf: Return proper error code
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'b8962d64':
  dxva2: Clean up definition of _WIN32_WINNT

Conflicts:
	libavcodec/dxva2.h

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

* commit '4600a85e':
  dxva2: Pass variable of correct type to IDirectXVideoDecoder_GetBuffer()

Conflicts:
	libavcodec/dxva2_h264.c
	libavcodec/dxva2_mpeg2.c
	libavcodec/dxva2_vc1.c

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