From 30b50f79aea355f3cf1b08dbfc36754689fd6383 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Storsj=C3=B6?= Date: Mon, 14 Jan 2013 11:34:19 +0200 Subject: [PATCH 1/2] rtpdec: Handle more received packets than expected when sending RR MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Without this, we'd signal a huge loss rate (due to unsigned wraparound) if we had received one packet more than expected (that is, one seq number sent twice). The code has a check for lost_interval <= 0, but that doesn't do what was intended as long as the variable is unsigned. Signed-off-by: Martin Storsjö --- libavformat/rtpdec.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavformat/rtpdec.c b/libavformat/rtpdec.c index 1ccc0f6f79..73d02069ea 100644 --- a/libavformat/rtpdec.c +++ b/libavformat/rtpdec.c @@ -258,7 +258,7 @@ int ff_rtp_check_and_send_back_rr(RTPDemuxContext *s, URLContext *fd, uint32_t extended_max; uint32_t expected_interval; uint32_t received_interval; - uint32_t lost_interval; + int32_t lost_interval; uint32_t expected; uint32_t fraction; From ba0c72a9ae1e2954e5dcf920f7b4e9a8f8a22f3e Mon Sep 17 00:00:00 2001 From: Diego Biurrun Date: Mon, 14 Jan 2013 16:43:41 +0100 Subject: [PATCH 2/2] build: Remove stray Makefile entry for non-existent VCR1 encoder --- libavcodec/Makefile | 1 - 1 file changed, 1 deletion(-) diff --git a/libavcodec/Makefile b/libavcodec/Makefile index 1001c2d407..2330f85fbb 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -385,7 +385,6 @@ OBJS-$(CONFIG_VC1_DXVA2_HWACCEL) += dxva2_vc1.o OBJS-$(CONFIG_VC1_VAAPI_HWACCEL) += vaapi_vc1.o OBJS-$(CONFIG_VC1_VDPAU_HWACCEL) += vdpau_vc1.o OBJS-$(CONFIG_VCR1_DECODER) += vcr1.o -OBJS-$(CONFIG_VCR1_ENCODER) += vcr1.o OBJS-$(CONFIG_VMDAUDIO_DECODER) += vmdav.o OBJS-$(CONFIG_VMDVIDEO_DECODER) += vmdav.o OBJS-$(CONFIG_VMNC_DECODER) += vmnc.o