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

* lukaszmluki/master:
  lavd/pulse: add ff_ prefix and fix param type
  lavd/pulse_audio_enc: fix flush return code
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* qatar/master:
  build: Remove redundant OBJS declaration intended for programs

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

Add ff_ prefix for internal API function.
Change type of param from int into enum AVCodecID as it is more specific.
Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>

Successful flushing is reported by returning 1 instead of 0.
Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>

These streams are reported as seekable, but all tests show they are not,
and the server merely pretends the streams are seekable. The server
responds with:

    content-range: bytes 0-1999999999/2000000000

Range requests seem to be correctly answered, but the actual data
returned at the same offset is different. Assume this is a bug in the
server software. The server identifies itself as:

    Server: MediaGateway 3.5.2-001

Add a hack that checks the server name, and disables seeking in this
case.

Test URL: http://8283.live.streamtheworld.com:80/CBC_R1_VCR_H_SCSigned-off-by: Michael Niedermayer <michaelni@gmx.at>

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

The intent of the original check was to increase has_b_frames when
it was incorrectly set to 0. Later codecs allowed larger values

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

There are instructions pavgb and pavgusb. Both instructions do the same
operation but they have different enconding. Pavgb exists in SSE (or
MMXEXT) instruction set and pavgusb exists in 3D-NOW instruction set.

livavcodec uses the macro PAVGB to select the proper instruction. However,
the function avg_pixels8_xy2 doesn't use this macro, it uses pavgb
directly.

As a consequence, the function avg_pixels8_xy2 crashes on AMD K6-2 and
K6-3 processors, because they have pavgusb, but not pavgb.

This bug seems to be introduced by commit
71155d7b, "dsputil: x86: Convert mpeg4
qpel and dsputil avg to yasm"
Signed-off-by: Mikulas Patocka <mikulas@artax.karlin.mff.cuni.cz>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

In particular, warn in case -filter and streamcopy is used at the same
time, fix trac ticket #678.

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

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

* cigaes/master:
  lavfi/af_pan: support unknown layouts on input.
  lavfi/af_pan: support unknown layouts on output.
  lswr: fix assert failure on unknown layouts.
  lavfi: parsing helper for unknown channel layouts.
  lavfi/avfiltergraph: do not reduce incompatible lists.
  lavfi/avfiltergraph: suggest a solution when format selection fails.
  lavd/lavfi: support unknown channel layouts.
  lavf/wavenc: check for a single stream.
  lavd/alsa: add stream validation
  lavd/alsa: fix timestamp calculation
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* qatar/master:
  rtmpproto: Reorder conditions to help dead code elimination

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

Also make AVCODEC_RESAMPLE API removal depends on its presence, since its
code depends on it as well.
Signed-off-by: Stefano Sabatini <stefasab@gmail.com>

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

* commit '3ea5f64f':
  ansi: fix possible use of uninitialized variables

Conflicts:
	libavcodec/ansi.c

Only partially merged, ffmpeg is not affected by this.
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'c0bba95c':
  wtv: fix variable sign in format
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '5858a67f':
  attributes: disable flatten on llvm/clang
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '3a14b160':
  vf_scale: make the dar variable return the DAR.

Conflicts:
	Changelog
	doc/filters.texi
	libavfilter/version.h

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

* commit '34a0ac41':
  vf_aspect: support variables in evaluating the aspect ratios

Conflicts:
	Changelog
	doc/filters.texi
	libavfilter/vf_aspect.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>

This makes sure that these branches are eliminated properly
with clang with optimizations disabled.

Fix trac ticket #2899.

Make ff_parse_channel_layout() accept unknown layouts too.

A list of "all channel layouts" but not "all channel counts"
can not be reduced to a single unknown channel count.

Format selection can fail if unknown channel layouts are used
with filters that do not support it.

Fix trac ticket #3110.

Don't trust provided streams.
Return with error when stream count is not 1 or
provided stream is not an audio stream.
Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>

Current implementation didn't include duration of
last processed packet.
Device may return negative timestamps without
this correction.
Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>