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 /libavutil/md5.c | |
| parent | 9e6769d2dc7bb33a2317b85fb55239958119e78c (diff) | |
| parent | c23c96b638cbf6c489fd301e6b3d5555632fba37 (diff) | |
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 'libavutil/md5.c')
0 files changed, 0 insertions, 0 deletions