diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-10-29 21:38:53 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-10-29 21:38:53 +0100 |
| commit | 0460b9bb3e34472223084a6c3ad35b4ded9c276b (patch) | |
| tree | a2b5d65619679309b96a8cc9b372c61ad0ab0afd /libavcodec/proresdata.c | |
| parent | 15b1b0887466f5c9ab3185a8fb62ebe54c0ff01b (diff) | |
| parent | c872d310cd9c605e5f994ad8ac79dc72303c0d29 (diff) | |
| download | ffmpeg-0460b9bb3e34472223084a6c3ad35b4ded9c276b.tar.gz | |
Merge commit 'c872d310cd9c605e5f994ad8ac79dc72303c0d29'
* commit 'c872d310cd9c605e5f994ad8ac79dc72303c0d29':
avconv: stop accessing AVStream.parser
Conflicts:
ffmpeg.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/proresdata.c')
0 files changed, 0 insertions, 0 deletions