Changeset 7d25af1 in ffmpeg

Timestamp:

May 20, 2014, 1:39:04 AM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

e50ae60d

Parents:

9e6769d2 (diff), c23c96b6 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

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>

(No files)