diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2013-10-30 00:38:53 +0400 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2013-10-30 00:38:53 +0400 |
commit | 0460b9bb3e34472223084a6c3ad35b4ded9c276b (patch) | |
tree | a2b5d65619679309b96a8cc9b372c61ad0ab0afd /ffmpeg.h | |
parent | 15b1b0887466f5c9ab3185a8fb62ebe54c0ff01b (diff) | |
parent | c872d310cd9c605e5f994ad8ac79dc72303c0d29 (diff) |
Merge commit 'c872d310cd9c605e5f994ad8ac79dc72303c0d29'
* commit 'c872d310cd9c605e5f994ad8ac79dc72303c0d29':
avconv: stop accessing AVStream.parser
Conflicts:
ffmpeg.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'ffmpeg.h')
-rw-r--r-- | ffmpeg.h | 2 |
1 files changed, 2 insertions, 0 deletions
@@ -371,6 +371,8 @@ typedef struct OutputStream { int copy_prior_start; int keep_pix_fmt; + + AVCodecParserContext *parser; } OutputStream; typedef struct OutputFile { |