Changeset b4f97d4a in ffmpeg

Timestamp:

Jan 9, 2014, 7:23:41 PM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

390452ba

Parents:

23ffc4c7 (diff), 4b48201 (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/09/14 19:14:10)

git-committer:

Michael Niedermayer <michaelni@gmx.at> (01/09/14 19:23:41)

Message:

Merge commit '4b48201d4d9d57a2a1ecf8504bc928aff83cb99a'

• commit '4b48201d4d9d57a2a1ecf8504bc928aff83cb99a': ac3tab.h: #include the correct headers

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

(No files)