Changeset 3e1f2413 in ffmpeg

Timestamp:

Mar 24, 2014, 1:51:44 PM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

8de75f70

Parents:

82e6660a (diff), d161ae0a (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 'd161ae0a37900cbd36c1390ca32a56b892c02ab5'

• commit 'd161ae0a37900cbd36c1390ca32a56b892c02ab5': frame: add a function for removing side data from a frame

Conflicts:

libavutil/version.h

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

(No files)