Changeset 87c4a80e in ffmpeg

Timestamp:

Jan 20, 2015, 8:15:25 PM (10 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

6c9dfa5a

Parents:

9cbaf584 (diff), bba02479 (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> (01/20/15 20:15:17)

git-committer:

Michael Niedermayer <michaelni@gmx.at> (01/20/15 20:15:25)

Message:

Merge commit 'bba02479260d0e7dec8c530a7e75a1c7aa53c06e'

• commit 'bba02479260d0e7dec8c530a7e75a1c7aa53c06e': libopenh264enc: Remove a workaround for silencing warnings about unused variables in the OpenH264 header

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

(No files)