Changeset a0cfec2e in ffmpeg

Timestamp:

Feb 20, 2014, 1:57:31 PM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

8372aaf7

Parents:

e948f17 (diff), ba42c852 (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/20/14 13:46:28)

git-committer:

Michael Niedermayer <michaelni@gmx.at> (02/20/14 13:57:31)

Message:

Merge commit 'ba42c852477e87f6e47a5587e8f7829c46c52032'

• commit 'ba42c852477e87f6e47a5587e8f7829c46c52032': bit_depth_template: Use file name as multiple inclusion guard

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

(No files)