diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-08-13 22:22:52 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-08-13 22:22:52 +0200 |
| commit | ed8e6d535cf4c56d82f9c91646dfc42787b719d6 (patch) | |
| tree | e7b1317c403a147ff633193417164e80d56f269e /libavfilter/x86 | |
| parent | ec14f53dbd02d4bbe12d8895370170804ab40779 (diff) | |
| parent | afbd4b7e093adf6d7a830b32759ca3ba8500363d (diff) | |
| download | ffmpeg-ed8e6d535cf4c56d82f9c91646dfc42787b719d6.tar.gz | |
Merge commit 'afbd4b7e093adf6d7a830b32759ca3ba8500363d'
* commit 'afbd4b7e093adf6d7a830b32759ca3ba8500363d':
lavf: add AVFormatContext/AVStream fields for signaling to the user when events happen.
Conflicts:
libavformat/avformat.h
libavformat/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavfilter/x86')
0 files changed, 0 insertions, 0 deletions