Changeset bd34e26b in ffmpeg

Timestamp:

Mar 24, 2014, 12:27:33 PM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

595ba3b9

Parents:

9456a862 (diff), 0e2c3ee (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 '0e2c3ee9a335d8a0a5edf0509e222e804d7b2619'

• commit '0e2c3ee9a335d8a0a5edf0509e222e804d7b2619': lavc: give a typedeffed name to the AVPacket.side_data struct

Conflicts:

doc/APIchanges
libavcodec/version.h

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

(No files)