* cigaes/master:
  lavfi/af_asetnsamples: fix EOF handling.
  lavu/opt: make sure av_opt_set_bin() handles NULL/0.
  lavd/v4l2: fully init an ioctl argument.
  lavfi: detect merge failure for unknown layouts.
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>

* qatar/master:
  oma: Validate sample rates

Conflicts:
	libavformat/oma.c

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

Only filter one buffered frame.
Correctly return EOF if there is none.

Silence a valgrind warning about uninitialized memory.

Detect when filtering known layouts from an explicit list
results in an empty list.

Fix erratic behavior.

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

We used to use 'filtergraph' or 'filter graph' randomly.

'filtergraph' was chosen due to having 57 occurrences in
the documentation, whereas 'filter graph' had only 19.
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

We used to use 'framerate' or 'frame rate' randomly.
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

These are available in the output of -formats.

Similarily, we do not list the fields for e.g. -codecs.
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

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

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

Add some indent and remove the '-' prefix for filters.

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

ffmpeg and ffplay use the loglevel as well as libpostproc, libswscale
and libswresample.

Also this makes the text shorter
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Simplify.

The PTS of the input frames must be interpreted according to the input
timebase, which is not the same as the output timebase.

The sample rate index is 3 bits even if currently index 5, 6 and 7 are
not supported.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org

Signed-off-by: Clément Bœsch <ubitux@gmail.com>

* qatar/master:
  doc/platform: Remove part about dllimport
  vp8: Fix pthread_cond and pthread_mutex leaks

Conflicts:
	doc/platform.texi
Merged-by: Michael Niedermayer <michaelni@gmx.at>

Fixes a crash init failed before setting avctx.

Partial fix for ticket #2412 in that using PIX_FMT_BGR24 fixes the
swapped channels issue when using scripts serving RGB24.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>