Changeset 8299ed26 in ffmpeg

Timestamp:

Aug 21, 2013, 10:32:33 AM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

e853cf5

Parents:

16466d92 (diff), 8fed466b (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> (08/21/13 10:32:15)

git-committer:

Michael Niedermayer <michaelni@gmx.at> (08/21/13 10:32:33)

Message:

Merge commit '8fed466b0a7d636ae5035f9c6074fba9a621539b'

• commit '8fed466b0a7d636ae5035f9c6074fba9a621539b': h264_ps: Drop commented-out cruft

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

(No files)