Merge commit 'ed61f3ca8a0664a697782253b354055136c5d303'

[ffmpeg] / ffmpeg.h

diff --git a/ffmpeg.h b/ffmpeg.h
index 04e5b7274b46a94d163c7ac6b94047cd1a8c8703..4fc1e18e306fd21abb9c59c5570d7b9b7afabb07 100644 (file)
--- a/ffmpeg.h
+++ b/ffmpeg.h
@@ -255,7 +255,6 @@ typedef struct InputStream {
     int64_t filter_in_rescale_delta_last;
 
     double ts_scale;
-    int is_start;            /* is 1 at the start and after a discontinuity */
     int saw_first_ts;
     int showed_multi_packet_warning;
     AVDictionary *opts;
@@ -327,6 +326,7 @@ typedef struct InputFile {
 
 #if HAVE_PTHREADS
     pthread_t thread;           /* thread reading from this file */
+    int non_blocking;           /* reading packets from the thread should not block */
     int finished;               /* the thread has exited */
     int joined;                 /* the thread has been joined */
     pthread_mutex_t fifo_lock;  /* lock for access to fifo */