rtpdec: Don't set RTP timestamps if they already are set by the depacketizer
authorMartin Storsjö <martin@martin.st>
Thu, 6 Jan 2011 11:33:06 +0000 (11:33 +0000)
committerMartin Storsjö <martin@martin.st>
Thu, 6 Jan 2011 11:33:06 +0000 (11:33 +0000)
commit79d482b108287b8d43adf6724deb2c6cd14e44d9
tree5985ecdb7ea70142de557b2c218699c917dc8621
parent6cbce6365067e1bdd5127d9001809726ea538e09
rtpdec: Don't set RTP timestamps if they already are set by the depacketizer

For MS-RTSP, we don't always get RTCP packets (never?), so the earlier
timestamping code never wrote anything into pkt->pts. The rtpdec_asf
depacketizer just sets the dts of the packet, so if the generic RTP
timestamping is used, too, we get inconsistent timestamps.

Therefore, skip the generic RTP timestamp algorithm if the depacketizer
already has set something.

This fixes "Invalid timestamps" warnings, present since SVN rev 26187.

Originally committed as revision 26241 to svn://svn.ffmpeg.org/ffmpeg/trunk
libavformat/rtpdec.c