calling the 4 clause BSD license non free is quite a stretch ;)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

looking at the license i cannot see why they would be incompatible and
researching this matter a bit also turned up no reasons.

If i missed something, please dont hesitate to flame me and or revert
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

* qatar/master:
  avprobe: restore pseudo-INI old style format for compatibility.
  avprobe: fix formatting.
  log: make colored output more colorful.
  rtsp: Check for dynamic payload handlers if no static payload mapping was found

Conflicts:
	Changelog
	doc/ffprobe.texi
	ffprobe.c
	libavutil/log.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>

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

* cus/stable:
  ffplay: force exit when filter configuration fails
  ffplay: fix stream cycling if audio decoding fails
  ffplay: flush codec buffers before freeing filters
  ffplay: dont destroy packet queues on stream change
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>

Based on work by ami_stuff.

Fixes ticket #1352

* qatar/master:
  opt: Add av_opt_set_bin()
  avconv: Display the error returned by avformat_write_header
  rtpenc_chain: Return an error code instead of just a plain pointer
  rtpenc_chain: Free the URLContext on failure
  rtpenc: Expose the ssrc as an avoption
  avprobe: display the codec profile in show_stream()
  avprobe: fix function prototype
  cosmetics: Fix indentation
  avprobe: changelog entry
  avprobe: update documentation
  avprobe: provide JSON output
  avprobe: output proper INI format
  avprobe: improve formatting
  rtmp: fix url parsing
  fate: document TARGET_EXEC and its usage

Conflicts:
	doc/APIchanges
	doc/fate.texi
	doc/ffprobe.texi
	ffprobe.c
	libavformat/version.h
	libavutil/avutil.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>

Green for verbose, cyan for debug.

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

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

Some systems abuse the static payload types 35 or 36 (which
according to IANA are unassigned) for H264.
Signed-off-by: Martin Storsjö <martin@martin.st>

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>

Introduce a new function to set binary data through AVOption,
avoiding having to convert the binary data to a string inbetween.
Signed-off-by: Martin Storsjö <martin@martin.st>

there are some holes in the list as some things have been fixed
in previous releases already.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Signed-off-by: Stefano Sabatini <stefasab@gmail.com>

Signed-off-by: Martin Storsjö <martin@martin.st>

Also check the return value in sapenc.
Signed-off-by: Martin Storsjö <martin@martin.st>

If an URLContext is passed in, its ownership is given to this
function, and is either owned by the returned AVFormatContext
on a successful return, or freed on failure.
Signed-off-by: Martin Storsjö <martin@martin.st>

This allows the caller to set it, and allows the caller to query
what it was set to.
Signed-off-by: Martin Storsjö <martin@martin.st>

Simplify, and as a side effect extend the number of supported formats, in
particular add a test for pal8.

Use lavfi-showfiltfmts for checking the format supported by the scale
filter instead. The advantage is that the scale filter may support
formats which are not supported by libswscale (namely: the pal8 format).

The new implementation is also a bit cleaner, because it doesn't depend
on the ffmpeg output.

Fixes part of Ticket1341
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Fixes part of Ticket1341
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>

Make opt_output_format return the correct value.

Fixes a part of ticket #1352.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Signed-off-by: Martin Storsjö <martin@martin.st>