* commit 'df507d5a':
  tiff: Replace deprecated PIX_FMT names by modern ones

Conflicts:
	libavcodec/tiff.c

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

* commit '7835c24e':
  dv: Update DV-profile-related functions to current public API

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

there is flushing code in the avformat core that does this in a more
controlled way.

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

This makes problematic unconditional flushes in mpegts redundant
And is thus part of a fix for ticket 2748
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

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

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

Makes the code a bit easier to read
Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

The name of the paragraph sounded a bit silly, and its text is small so
it's better to merge it with the previous paragraph.

Up to four instructions less depending on function and instruction set.
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Found-by: CSA
Reviewed-by: Nicolas George <george@nsup.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

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

This makes the code easier to understand as the scope of the variable is
smaller.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Its not removed as the code which uses this is out-commented too.

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

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

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

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

* commit 'ffa4d4ef':
  ppc: fft: Build AltiVec optimizations in the standard way

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

also check pbuffer before use

Found-by: CSA
Reviewed-by: Stefano Sabatini <stefasab@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

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

DTS primarly needs to be separated from PCM, and PCM can contain cliping and
overshoots at the very start which can mimic DTS headers.

If this isnt sufficient then more of the DTS stream has to be decoded
and analyzed

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

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

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

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

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

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

* commit 'f0e95948':
  af_channelmap: Set the frame channel layout
Merged-by: Michael Niedermayer <michaelni@gmx.at>

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

Otherwise the frame would show the first layout matching the
channel count.

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>