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 /doc | |
| 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 'doc')
| -rw-r--r-- | doc/APIchanges | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/doc/APIchanges b/doc/APIchanges index b7961ae6da..79b684501e 100644 --- a/doc/APIchanges +++ b/doc/APIchanges @@ -15,6 +15,10 @@ libavutil: 2014-08-09 API changes, most recent first: +2014-xx-xx - xxxxxxx - lavf 56.01.0 - avformat.h + Add AVFormatContext.event_flags and AVStream.event_flags for signaling to + the user when events happen in the file/stream. + 2014-04-xx - xxxxxxx - lavr 2.1.0 - avresample.h Add avresample_convert_frame() and avresample_config(). |