Changeset cfef947 in ffmpeg

Timestamp:

Nov 6, 2014, 12:54:11 PM (10 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

94fe404c

Parents:

b6a99563 (diff), c070a875 (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> (11/06/14 12:54:03)

git-committer:

Michael Niedermayer <michaelni@gmx.at> (11/06/14 12:54:11)

Message:

Merge commit 'c070a8751597e3aa1b443e88464da785d8966b14'

• commit 'c070a8751597e3aa1b443e88464da785d8966b14': lavc: make avpriv_flac_parse_streaminfo() private on the next bump

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

(No files)