[FFmpeg-cvslog] Do not use format string "%0.3f" for RTSP Range field.
Carl Eugen Hoyos
git at videolan.org
Tue Mar 22 10:20:44 CET 2011
ffmpeg | branch: master | Carl Eugen Hoyos <cehoyos at ag.or.at> | Tue Mar 22 10:19:42 2011 +0100| [2da715c52581faa905de15d392aa4106431877d8] | committer: Carl Eugen Hoyos
Do not use format string "%0.3f" for RTSP Range field.
Fixes ticket 10.
The format string was locale-depending.
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=2da715c52581faa905de15d392aa4106431877d8
---
libavformat/rtspdec.c | 11 ++++++++---
1 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/libavformat/rtspdec.c b/libavformat/rtspdec.c
index 95b8690..f0187de 100644
--- a/libavformat/rtspdec.c
+++ b/libavformat/rtspdec.c
@@ -59,9 +59,14 @@ static int rtsp_read_play(AVFormatContext *s)
if (rt->state == RTSP_STATE_PAUSED) {
cmd[0] = 0;
} else {
- snprintf(cmd, sizeof(cmd),
- "Range: npt=%0.3f-\r\n",
- (double)rt->seek_timestamp / AV_TIME_BASE);
+ if (!rt->seek_timestamp) {
+ snprintf(cmd, sizeof(cmd), "Range: npt=0.000-\r\n");
+ } else {
+ snprintf(cmd, sizeof(cmd),
+ "Range: npt=%"PRId64".%03"PRId64"-\r\n",
+ rt->seek_timestamp / AV_TIME_BASE,
+ rt->seek_timestamp / (AV_TIME_BASE / 1000) % 1000);
+ }
}
ff_rtsp_send_cmd(s, "PLAY", rt->control_uri, cmd, reply, NULL);
if (reply->status_code != RTSP_STATUS_OK) {
More information about the ffmpeg-cvslog
mailing list