RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-01-24 08:13:37 +00:00
Code Issues Projects Releases Wiki Activity

Merge commit 'abae27ed3acd0a7c54f11760c5be2d2653c4edf8'

Browse Source 
* 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:
Michael Niedermayer 2013-01-13 13:54:32 +01:00
commit 6d6eb7c12c
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libavformat/rtpdec.c
View File

@ -273,7 +273,7 @@ int ff_rtp_check_and_send_back_rr(RTPDemuxContext *s, URLContext *fd,
// some placeholders we should really fill... // some placeholders we should really fill...
// RFC 1889/p64 // RFC 1889/p64
extended_max = stats->cycles + stats->max_seq; 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 = expected - stats->received;
lost = FFMIN(lost, 0xffffff); // clamp it since it's only 24 bits... lost = FFMIN(lost, 0xffffff); // clamp it since it's only 24 bits...
expected_interval = expected - stats->expected_prior; expected_interval = expected - stats->expected_prior;

8
tests/fate/vpx.mak
View File

@ -1,10 +1,10 @@
FATE_VP3-$(CONFIG_MATROSKA_DEMUXER) += fate-vp3-coeff-level64 FATE_VP3-$(call DEMDEC, MATROSKA, THEORA) += fate-theora-coeff-level64
fate-vp3-coeff-level64: CMD = framecrc -i $(SAMPLES)/vp3/coeff_level64.mkv 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-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-vp3: $(FATE_VP3-yes)
FATE_SAMPLES_AVCONV-$(call DEMDEC, AVI, VP5) += fate-vp5 FATE_SAMPLES_AVCONV-$(call DEMDEC, AVI, VP5) += fate-vp5

0
tests/ref/fate/vp3-coeff-level64 → tests/ref/fate/theora-coeff-level64
View File