diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-03-24 02:12:17 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-03-24 02:16:11 +0100 |
| commit | 2fd41c9067fc67b40f80e9cbd4787018009040db (patch) | |
| tree | 378cc399057a6089f3f06bc62f0eff97d3ada56b /libavformat/rtspdec.c | |
| parent | 00dc0206cb5b351a66d7cce77b8a65fabe6ea7da (diff) | |
| parent | 4ec153bb66a95da46c98e269bd0aa787e6172ed3 (diff) | |
| download | ffmpeg-2fd41c9067fc67b40f80e9cbd4787018009040db.tar.gz | |
Merge remote-tracking branch 'newdev/master'
* newdev/master:
avio: make udp_set_remote_url/get_local_port internal.
asfdec: also subtract preroll when reading simple index object
matroskaenc: remove a variable that's unused after bc17bd9.
avio: cosmetics - nicer vertical alignment.
Remove unnecessary icc version checks
Disable 'attribute "foo" ignored' warnings from icc
rtsp: Don't use a locale dependent format string
Add xd55 codec tag for XDCAM HD422 720p25 CBR files.
configure: get libavcodec version from new version.h header
lavc: move the version macros to a new installed header.
matroskaenc: simplify get_aac_sample_rates by using ff_mpeg4audio_get_config
Do not use format string "%0.3f" for RTSP Range field.
Add apply_window_int16() to DSPContext with x86-optimized versions and use it in the ac3_fixed encoder.
Document usage of import libraries created by dlltool
configure: Set the correct lib target for arm/wince dlltool
fate: simplify regression-funcs.sh
fate: add support for multithread testing
Conflicts:
libavformat/rtspdec.c
libavutil/attributes.h
libavutil/internal.h
libavutil/mem.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/rtspdec.c')
| -rw-r--r-- | libavformat/rtspdec.c | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/libavformat/rtspdec.c b/libavformat/rtspdec.c index f0187de714..8fa419714e 100644 --- a/libavformat/rtspdec.c +++ b/libavformat/rtspdec.c @@ -59,14 +59,10 @@ static int rtsp_read_play(AVFormatContext *s) if (rt->state == RTSP_STATE_PAUSED) { cmd[0] = 0; } else { - 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); - } + 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) { |