Changeset fa4e17c1 in ffmpeg

Timestamp:

Jun 2, 2014, 5:28:54 PM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

b55d3bbe

Parents:

666e29fe (diff), b88cc5cc (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 'b88cc5cca111132b42c2ee99662bfefe7652e3da'

• commit 'b88cc5cca111132b42c2ee99662bfefe7652e3da': bink: Rename BinkDSPContext member so as not to clash with BlockDSPContext

Conflicts:

libavcodec/bink.c

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

(No files)