Changeset 9408d990 in ffmpeg

Timestamp:

Aug 1, 2013, 11:59:50 AM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

bb7f71d9

Parents:

0f5a40c2 (diff), 3c8bff07 (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.

git-author:

Michael Niedermayer <michaelni@gmx.at> (08/01/13 11:59:47)

git-committer:

Michael Niedermayer <michaelni@gmx.at> (08/01/13 11:59:50)

Message:

Merge remote-tracking branch 'qatar/master'

• qatar/master: avframe: have av_frame_get_side_data take const AVFrame*

Merged-by: Michael Niedermayer <​michaelni@gmx.at>

(No files)