diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2014-05-20 03:39:04 +0200 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2014-05-20 03:39:04 +0200 |
commit | 7d25af1547f8d97231f1c6e4cab7ad2bbf1dd071 (patch) | |
tree | 4e3c6acef8b008570ae2db92455799014fc5eeca /doc | |
parent | 9e6769d2dc7bb33a2317b85fb55239958119e78c (diff) | |
parent | c23c96b638cbf6c489fd301e6b3d5555632fba37 (diff) | |
download | ffmpeg-7d25af1547f8d97231f1c6e4cab7ad2bbf1dd071.tar.gz |
Merge commit 'c23c96b638cbf6c489fd301e6b3d5555632fba37'
* commit 'c23c96b638cbf6c489fd301e6b3d5555632fba37':
lavf: add av_stream_get_side_data
Conflicts:
doc/APIchanges
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 6999594966..323f773c96 100644 --- a/doc/APIchanges +++ b/doc/APIchanges @@ -15,6 +15,10 @@ libavutil: 2012-10-22 API changes, most recent first: +2014-05-19 - xxxxxxx - lavf 55.18.0 - avformat.h + Add av_stream_get_side_data() to access stream-level side data + in the same way as av_packet_get_side_data(). + 2014-05-xx - xxxxxxx - lavu 52.86.100 - fifo.h Add av_fifo_alloc_array() function. |