Merge commit 'c872d310cd9c605e5f994ad8ac79dc72303c0d29'

* commit 'c872d310cd9c605e5f994ad8ac79dc72303c0d29':
  avconv: stop accessing AVStream.parser

Conflicts:
	ffmpeg.h

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

1 files changed, 2 insertions, 0 deletions

diff --git a/ffmpeg.h b/ffmpeg.h
index 054e71814d..c001d2cc16 100644
--- a/ffmpeg.h
+++ b/ffmpeg.h
@@ -371,6 +371,8 @@ typedef struct OutputStream {
     int copy_prior_start;
 
     int keep_pix_fmt;
+
+    AVCodecParserContext *parser;
 } OutputStream;
 
 typedef struct OutputFile {