Merge commit 'cb214707a6cb0d3272ec0261af6f1f5d8b7dabc7'

[ffmpeg] / ffmpeg.h

diff --git a/ffmpeg.h b/ffmpeg.h
index 24e6d47d0bd86f54c1264ef1c35fb19784d2dfe5..09b29a96738962cac02ba1d566803e458c7a3887 100644 (file)
--- a/ffmpeg.h
+++ b/ffmpeg.h
@@ -93,6 +93,7 @@ typedef struct OptionsContext {
     /* input options */
     int64_t input_ts_offset;
     int rate_emu;
+    int accurate_seek;
 
     SpecifierOpt *ts_scale;
     int        nb_ts_scale;
@@ -282,10 +283,13 @@ typedef struct InputFile {
     int ist_index;        /* index of first stream in input_streams */
     int64_t ts_offset;
     int64_t last_ts;
+    int64_t start_time;   /* user-specified start time in AV_TIME_BASE or AV_NOPTS_VALUE */
+    int64_t recording_time;
     int nb_streams;       /* number of stream that ffmpeg is aware of; may be different
                              from ctx.nb_streams if new streams appear during av_read_frame() */
     int nb_streams_warn;  /* number of streams that the user was warned of */
     int rate_emu;
+    int accurate_seek;
 
 #if HAVE_PTHREADS
     pthread_t thread;           /* thread reading from this file */