* commit 'fbc0b865':
  lavr: Do not change the sample format for mono audio
Merged-by: Michael Niedermayer <michaelni@gmx.at>

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

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

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

This treats mono as planar internally within libavresample rather
than changing the sample format.
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>

* commit '9f17685d':
  avcodec: Deprecate unused defines and options

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

* commit 'bad81800':
  avcodec: options: Add missing deprecation ifdefs around emu_edge
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '072916d9':
  filtfmts: Replace deprecated uses of AVFilterPad

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

* commit '6a928293':
  examples: filter_audio: Add missing mem.h header for av_freep()
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'c6a1ac2d':
  vf_fps: Replace use of deprecated AVFilterBufferRef by AVFrame

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

* commit 'c697c590':
  lcl: Disentangle pointers to input data and decompression buffer

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

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

Also add missing mem.h header for av_freep().

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.

This is cleaner and avoids a cast plus a related const qualifier warning.

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>