Merge commit 'c872d310cd9c605e5f994ad8ac79dc72303c0d29'

* commit 'c872d310cd9c605e5f994ad8ac79dc72303c0d29': avconv: stop accessing AVStream.parser Conflicts: ffmpeg.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-29 21:38:53 +01:00
parent 15b1b08874 c872d310cd
commit 0460b9bb3e
2 changed files with 10 additions and 1 deletions
--- 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 {