diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-07-22 11:56:53 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-07-22 12:08:52 +0200 |
| commit | 4095fa903830f8395a26d6ee38c77ad6333a4f5e (patch) | |
| tree | 828ada22309e543a181997b63c6ffca6868731ac /libavformat/rtpdec.c | |
| parent | 657eac048eb267d781de83849fe7616d29320832 (diff) | |
| parent | bb32fded3623a20ff8999c2924315841c08c985c (diff) | |
| download | ffmpeg-4095fa903830f8395a26d6ee38c77ad6333a4f5e.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
dnxhddec: optimise dnxhd_decode_dct_block()
rtp: remove disabled code
eac3enc: use different numbers of blocks per frame to allow higher bitrates
dnxhd: add regression test for 10-bit
dnxhd: 10-bit support
dsputil: update per-arch init funcs for non-h264 high bit depth
dsputil: template get_pixels() for different bit depths
dsputil: create 16/32-bit dctcoef versions of some functions
jfdctint: add 10-bit version
mov: add clcp type track as Subtitle stream.
mpeg4: add Mpeg4 Profiles names.
mpeg4: decode Level Profile for MPEG4 Part 2.
ffprobe: display bitstream level.
imgconvert: remove unused glue and xglue macros
Conflicts:
libavcodec/dsputil_template.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/rtpdec.c')
| -rw-r--r-- | libavformat/rtpdec.c | 16 |
1 files changed, 0 insertions, 16 deletions
diff --git a/libavformat/rtpdec.c b/libavformat/rtpdec.c index 995f3bffd4..f9252a9bb3 100644 --- a/libavformat/rtpdec.c +++ b/libavformat/rtpdec.c @@ -218,22 +218,6 @@ static int rtp_valid_packet_in_sequence(RTPStatistics *s, uint16_t seq) return 1; } -#if 0 -/** -* This function is currently unused; without a valid local ntp time, I don't see how we could calculate the -* difference between the arrival and sent timestamp. As a result, the jitter and transit statistics values -* never change. I left this in in case someone else can see a way. (rdm) -*/ -static void rtcp_update_jitter(RTPStatistics *s, uint32_t sent_timestamp, uint32_t arrival_timestamp) -{ - uint32_t transit= arrival_timestamp - sent_timestamp; - int d; - s->transit= transit; - d= FFABS(transit - s->transit); - s->jitter += d - ((s->jitter + 8)>>4); -} -#endif - int rtp_check_and_send_back_rr(RTPDemuxContext *s, int count) { AVIOContext *pb; |