summaryrefslogtreecommitdiff
path: root/ffmpeg.h
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2013-11-14 01:21:20 +0100
committerMichael Niedermayer <michaelni@gmx.at>2013-11-16 14:27:29 +0100
commitd7ebeba80c609e160a171168b3434c342a652237 (patch)
tree1807e0aebc5b53f1c167058a82fcf990f9565fea /ffmpeg.h
parentd04b7de786780747878c080ba522405c6f542ccb (diff)
downloadffmpeg-d7ebeba80c609e160a171168b3434c342a652237.tar.gz
ffmpeg: Do not fill gap before the first decodable frame on single stream input files unless the user explicitly requests it.
Fixes different behavior to JM and probably several if not all reference decoders. We cannot just do this unconditionally as it would ruin AV sync in some use cases. Bug-Found-by: BugMaster Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'ffmpeg.h')
-rw-r--r--ffmpeg.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/ffmpeg.h b/ffmpeg.h
index 409525c2eb..9f6bd96b1f 100644
--- a/ffmpeg.h
+++ b/ffmpeg.h
@@ -51,6 +51,7 @@
#define VSYNC_PASSTHROUGH 0
#define VSYNC_CFR 1
#define VSYNC_VFR 2
+#define VSYNC_VSCFR 0xfe
#define VSYNC_DROP 0xff
#define MAX_STREAMS 1024 /* arbitrary sanity check value */
@@ -281,6 +282,7 @@ typedef struct InputFile {
int eof_reached; /* true if eof reached */
int eagain; /* true if last read attempt returned EAGAIN */
int ist_index; /* index of first stream in input_streams */
+ int64_t input_ts_offset;
int64_t ts_offset;
int64_t last_ts;
int64_t start_time; /* user-specified start time in AV_TIME_BASE or AV_NOPTS_VALUE */