Changeset a88cbdf in ffmpeg

Timestamp:

Feb 24, 2014, 7:53:10 PM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

3d53bbd0

Parents:

a908de7f (diff), d00a504b (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> (02/24/14 19:40:52)

git-committer:

Michael Niedermayer <michaelni@gmx.at> (02/24/14 19:53:10)

Message:

Merge commit 'd00a504b244e136a0c82a55e21ed94659e0674ad'

• commit 'd00a504b244e136a0c82a55e21ed94659e0674ad': libx265: Update API usage

Conflicts:

libavcodec/libx265.c

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

(No files)