* qatar/master:
  doc: Replace some @file tags by more suitable markup.
  fate: Set FUZZ factor of vorbis-13 test to 2.
  fate: Set FUZZ factor of (e)ac3-encode test to 3.
  fate: remove unused code from regressions-funcs.sh
  rtmp: Don't assume path points to a string of nonzero length
  avconv: fix behavior with -ss as an output option.

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

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

These helpers are handy, just notice the user it is done using lavfi.

This allow specifying hexadecimal channel layout, and also handle the
error printing internally.

The errors need to be defined before including functions depending on
them. See av_size_mult() for instance. stddef.h is included for the
prototype of av_sterror (use of size_t).

all_channel_layouts.h is not a real header file and breaks make checkheaders.

The difference from this should be pretty small.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

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

This fixes a regression that apparently was missed when switching to the
in af resampler
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

This is necessary to account for different rounding done in the 3DNow!
Assembly optimizations.

This is necessary to account for different rounding done in the 3DNow!
Assembly optimizations.

The only uses of the do_avconv_nomd5() function were removed in
85cf49fa.
Signed-off-by: Mans Rullgard <mans@mansr.com>

* cus/stable:
  ffplay: put aspect ratio info to the VideoPicture struct
  ffplay: use AVFrame::width and height instead of using codec or filter settings
  ffplay: use stream sample_aspect_ratio if available in source frames
  ffplay: fix video_thread when no frame is returned in get_video_frame
Merged-by: Michael Niedermayer <michaelni@gmx.at>

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

Allow to explicitly specify the channel layout to select.

* qatar/master:
  pcmenc: set correct bitrate value
  avprobe: don't print format entry name when only one was requested

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

Inspired-by code from af_resample.c written by Anton Khirnov
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Issue found by comparing af_resample.c and af_aresample.c
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

If using the new -rtmp_app and -rtmp_playpath parameters,
one can in many cases set the main url to just rtmp://server/.
If the trailing slash is omitted, path is a string of zero length,
and using path+1 will end up reading uninitialized data.
Signed-off-by: Martin Storsjö <martin@martin.st>