mirror of
https://git.ffmpeg.org/ffmpeg.git
synced 2024-12-22 23:33:07 +00:00
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>
This commit is contained in:
commit
6d6eb7c12c
@ -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;
|
||||
|
@ -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
|
||||
|
Loading…
Reference in New Issue
Block a user