summaryrefslogtreecommitdiff
path: root/libavformat/ffm.h
diff options
context:
space:
mode:
authorClément Bœsch <clement.boesch@smartjog.com>2012-10-05 16:46:01 +0200
committerClément Bœsch <ubitux@gmail.com>2012-10-08 09:03:19 +0200
commitf7c46d251c9a2d645568c2c38c543e5e31fac812 (patch)
treeafc0502c0544d751c7ced9bdba2175e7b0ff3c48 /libavformat/ffm.h
parent9425dc3dba0bd1209aa7a788ea8f3c194fc7c7c5 (diff)
ffserver: fix seeking with ?date=...
Regression since 5f847bf61dca1fd1a2f65a2f56c9a99d1cb716ab. After this commit, timestamps pushed by FFmpeg won't be relative anymore, but absolute (based on the date/time at the beginning of the push). This will allow seeking to work properly. Before this patch, the seek was done, but ffm timestamps were way smallers than the absolute requested timestamp (based on a date), so the seek was done, but to the end of the stream (which was similar to no effect at all).
Diffstat (limited to 'libavformat/ffm.h')
-rw-r--r--libavformat/ffm.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/libavformat/ffm.h b/libavformat/ffm.h
index 04f19cc88e..49402355f4 100644
--- a/libavformat/ffm.h
+++ b/libavformat/ffm.h
@@ -54,6 +54,7 @@ typedef struct FFMContext {
int64_t dts;
uint8_t *packet_ptr, *packet_end;
uint8_t packet[FFM_PACKET_SIZE];
+ int64_t start_time;
} FFMContext;
int64_t ffm_read_write_index(int fd);