diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-01-13 13:54:32 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-01-13 13:54:52 +0100 |
| commit | 6d6eb7c12c833b33ce94e7bd963b1d770defd56c (patch) | |
| tree | 3b4a40e93f46031fc8a4325d18af59d469f39f7a | |
| parent | 841a288cb32785400261cbab959fcfb982d3f699 (diff) | |
| parent | abae27ed3acd0a7c54f11760c5be2d2653c4edf8 (diff) | |
| download | ffmpeg-6d6eb7c12c833b33ce94e7bd963b1d770defd56c.tar.gz | |
Merge commit 'abae27ed3acd0a7c54f11760c5be2d2653c4edf8'
* commit 'abae27ed3acd0a7c54f11760c5be2d2653c4edf8':
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>
| -rw-r--r-- | libavformat/rtpdec.c | 2 | ||||
| -rw-r--r-- | tests/fate/vpx.mak | 8 | ||||
| -rw-r--r-- | tests/ref/fate/theora-coeff-level64 (renamed from tests/ref/fate/vp3-coeff-level64) | 0 |
3 files changed, 5 insertions, 5 deletions
diff --git a/libavformat/rtpdec.c b/libavformat/rtpdec.c index 17e2e87bd3..6f6fa799dc 100644 --- a/libavformat/rtpdec.c +++ b/libavformat/rtpdec.c @@ -273,7 +273,7 @@ int ff_rtp_check_and_send_back_rr(RTPDemuxContext *s, URLContext *fd, // some placeholders we should really fill... // RFC 1889/p64 extended_max = stats->cycles + stats->max_seq; - expected = extended_max - stats->base_seq + 1; + expected = extended_max - stats->base_seq; lost = expected - stats->received; lost = FFMIN(lost, 0xffffff); // clamp it since it's only 24 bits... expected_interval = expected - stats->expected_prior; diff --git a/tests/fate/vpx.mak b/tests/fate/vpx.mak index 1c57ed8b02..a51ef078b1 100644 --- a/tests/fate/vpx.mak +++ b/tests/fate/vpx.mak @@ -1,10 +1,10 @@ -FATE_VP3-$(CONFIG_MATROSKA_DEMUXER) += fate-vp3-coeff-level64 -fate-vp3-coeff-level64: CMD = framecrc -i $(SAMPLES)/vp3/coeff_level64.mkv +FATE_VP3-$(call DEMDEC, MATROSKA, THEORA) += fate-theora-coeff-level64 +fate-theora-coeff-level64: CMD = framecrc -i $(SAMPLES)/vp3/coeff_level64.mkv -FATE_VP3-$(CONFIG_AVI_DEMUXER) += fate-vp31 +FATE_VP3-$(call DEMDEC, AVI, VP3) += fate-vp31 fate-vp31: CMD = framecrc -i $(SAMPLES)/vp3/vp31.avi -FATE_SAMPLES_AVCONV-$(CONFIG_VP3_DECODER) += $(FATE_VP3-yes) +FATE_SAMPLES_AVCONV += $(FATE_VP3-yes) fate-vp3: $(FATE_VP3-yes) FATE_SAMPLES_AVCONV-$(call DEMDEC, AVI, VP5) += fate-vp5 diff --git a/tests/ref/fate/vp3-coeff-level64 b/tests/ref/fate/theora-coeff-level64 index 4bfafaf5ef..4bfafaf5ef 100644 --- a/tests/ref/fate/vp3-coeff-level64 +++ b/tests/ref/fate/theora-coeff-level64 |