Merge commit '67f2a688143b644f99360565a9f36c61a5f052e9'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 24 Feb 2014 20:08:19 +0000 (21:08 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 24 Feb 2014 20:08:19 +0000 (21:08 +0100)
* commit '67f2a688143b644f99360565a9f36c61a5f052e9':
  avconv: remove a write-only variable

Conflicts:
ffmpeg.c
ffmpeg.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
ffmpeg.c
ffmpeg.h

index 899038e..332a233 100644 (file)
--- a/ffmpeg.c
+++ b/ffmpeg.c
@@ -2156,7 +2156,6 @@ static int init_input_stream(int ist_index, char *error, int error_len)
 
     ist->next_pts = AV_NOPTS_VALUE;
     ist->next_dts = AV_NOPTS_VALUE;
-    ist->is_start = 1;
 
     return 0;
 }
index 151667d..4fc1e18 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;