Merge commit 'c23c96b638cbf6c489fd301e6b3d5555632fba37'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 20 May 2014 01:39:04 +0000 (03:39 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 20 May 2014 01:39:04 +0000 (03:39 +0200)
commit7d25af1547f8d97231f1c6e4cab7ad2bbf1dd071
tree4e3c6acef8b008570ae2db92455799014fc5eeca
parent9e6769d2dc7bb33a2317b85fb55239958119e78c
parentc23c96b638cbf6c489fd301e6b3d5555632fba37
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>
doc/APIchanges
libavformat/avformat.h
libavformat/utils.c
libavformat/version.h