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

* qatar/master:
  rtpdec: Send a valid "delay since SR" value in the RTCP RR packets
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'e568db40':
  rtpdec: Calculate and report packet reception jitter
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'abae27ed':
  rtpdec: Fix the calculation of expected number of packets
  fate: vp3: Fix fate-vp3-coeff-level64 test dependencies
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '4d3b144c':
  fate: cosmetics: Order some test entries

Conflicts:
	tests/fate/lossless-video.mak
	tests/fate/microsoft.mak
Merged-by: Michael Niedermayer <michaelni@gmx.at>

Fixes assertion failure

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

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

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

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

This allows using code working with 4 at a time
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Previously, we always signalled a zero time since the last RTCP
SR, which is dubious.

The code also suggested that this would be the difference in
RTP NTP time units (32.32 fixed point), while it actually is
in in 1/65536 second units. (RFC 3550 section 6.4.1)
Signed-off-by: Martin Storsjö <martin@martin.st>

This brings back some code that was added originally in 4a6cc061
but never was used, and was removed as unused in 4cc843fa. The
code is updated to actually work and is tested to return sane
values.
Signed-off-by: Martin Storsjö <martin@martin.st>

The base_seq variable is set to first_seq - 1 (in
rtp_init_sequence), so no + 1 is needed here.

This avoids reporting 1 lost packet from the start.
Signed-off-by: Martin Storsjö <martin@martin.st>

Reviewed-by: saste
Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

maybe a very tiny bit faster
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

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

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

If nb_samples divide sample_rate and if nb_samples allow it, aevalsrc
should generate the exact amount of samples according to duration.

Example:
aevalsrc=0::n=480:s=48000:d=5.21 should generate 250080 samples.
Signed-off-by: Stefano Sabatini <stefasab@gmail.com>

Also rename the test to reflect that the video track is Theora, not VP3.

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

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

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

* qatar/master:
  Add version bump and APIchanges entry for Add AV_PIX_FMT_VDPAU.
  pixfmt: add picture format for VDPAU

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

* commit 'f61272f0':
  ratecontrol: K&R cosmetic formatting
  rtpdec: Remove a useless todo comment

Conflicts:
	libavcodec/ratecontrol.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '54cb096e':
  rtsp: Remove an outdated comment
  rtsp: Remove references to weirdly named variables in other files
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'c44784c9':
  rtp: Rename a static variable to normal naming conventions
  rtp: Cosmetic cleanup
Merged-by: Michael Niedermayer <michaelni@gmx.at>

Also fix a lavu version typo in APIchanges.

Signed-off-by: Diego Biurrun <diego@biurrun.de>

Signed-off-by: Diego Biurrun <diego@biurrun.de>

Suggested-By: Alexander Strasser

The paragraph is about what ffserver is not and where to look for other
information, but is pretty redundant and distracting, especially
considering the new organization of the documentation.

In particular, add some markup, fix empty line, and merge it with "How
does it work?" section.

In particular, favor predicative form over nominal description of the set
parameter. This is more globally consistent.

Fixes out of array reads

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Fixes null pointer dereference

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

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

Fixes NULL pointer dereference

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>