diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-01-15 14:42:20 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-01-15 14:42:24 +0100 |
| commit | 8686b6c68bacfdd9ffa89736756192188973ad5d (patch) | |
| tree | 9035626a0b754ea909ae6515c006417b81b4085d | |
| parent | eaf1f01169357bf11883d1a7d9f0e6bbf62b26d8 (diff) | |
| parent | ba0c72a9ae1e2954e5dcf920f7b4e9a8f8a22f3e (diff) | |
| download | ffmpeg-8686b6c68bacfdd9ffa89736756192188973ad5d.tar.gz | |
Merge commit 'ba0c72a9ae1e2954e5dcf920f7b4e9a8f8a22f3e'
* commit 'ba0c72a9ae1e2954e5dcf920f7b4e9a8f8a22f3e':
build: Remove stray Makefile entry for non-existent VCR1 encoder
rtpdec: Handle more received packets than expected when sending RR
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavcodec/Makefile | 1 | ||||
| -rw-r--r-- | libavformat/rtpdec.c | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/libavcodec/Makefile b/libavcodec/Makefile index 0925e9606b..06d426b680 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -459,7 +459,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 diff --git a/libavformat/rtpdec.c b/libavformat/rtpdec.c index 0cfb74f175..597b8040a3 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; |