Merge commit '67f2a688143b644f99360565a9f36c61a5f052e9'

* commit '67f2a688143b644f99360565a9f36c61a5f052e9':
  avconv: remove a write-only variable

Conflicts:
	ffmpeg.c
	ffmpeg.h

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

1 files changed, 0 insertions, 1 deletions

diff --git a/ffmpeg.c b/ffmpeg.c
index 899038e602..332a2338cd 100644
--- 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;
 }