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>

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>

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

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

This is needed for av_dict_*
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Signed-off-by: Paul B Mahol <onemda@gmail.com>

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

Overreads can not happen as header size of 512 bytes is required.
Signed-off-by: Paul B Mahol <onemda@gmail.com>

Libsoxr 0.1.1 will be out very soon; no changes planned beyond what's currently in git.
It includes a couple of fixes (not affecting FFmpeg's current usage) and a minor API change (but remains ABI compatible).
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Signed-off-by: Paul B Mahol <onemda@gmail.com>

* qatar/master:
  lls: Do not return from void functions
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '4da950c0':
  lls: #ifndef --> #if in FF_API_ version guard
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'e8c52271':
  Revert "Move H264/QPEL specific asm from dsputil.asm to h264_qpel_*.asm."

Conflicts:
	libavcodec/x86/dsputil.asm
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '399663be':
  lls: mark max_order as unsigned short
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '9d4da474':
  lls: move to the private namespace

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

* commit '7ac6d242':
  lls: K&R formatting cosmetics
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'df0229a7':
  avconv: Apply codec options to streams that are copied as well
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'cb6f8245':
  cmdutils: Allow calling filter_codec_opts without a set encoder
  pnm: Use av_pix_fmt_desc_get instead of accessing the array directly
Merged-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>

This reverts commit f90ff772.

The code should be put back in h264_qpel_8bit.asm, but unfortunately
it is unconditionally used from dsputil_mmx.c since 71155d7b.

This ensures that fps and other values are estimated correctly,
the probesize also is intended to limit disk/protocol reads which
does not apply to lavfi inputs at all.

Fixes Ticket1051

Something similar could be usefull to other input devices
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Signed-off-by: Paul B Mahol <onemda@gmail.com>

This only happens with missing chlist attribute from header.
Signed-off-by: Paul B Mahol <onemda@gmail.com>

Previous naming was misleading.

Also fix wrong message about missing
support for 32-bit unsigned int pixel type.
Signed-off-by: Paul B Mahol <onemda@gmail.com>

Needed for proper decoding of channels with subsampling
and also for remaining compression methods.
Signed-off-by: Paul B Mahol <onemda@gmail.com>

If the first "special" character in a filename is a comma,
it can introduce protocol options, but only if there is a
colon at the end. Otherwise, it is just a filename with a
comma.

Fix trac ticket #2303.

If the channel layout is unknown, lswr will internally use
the default one for the corresponding number of channels.

Fix trac ticket #2300 because the duration of the segments
was computed using the timestamp of the last packet plus its
duration using the 1/90000 default time base instead of using
the chained muxer time base.

Fix a segfault on 64-bits archs.