Changeset 4273236e in ffmpeg

Timestamp:

Aug 31, 2013, 11:36:01 AM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

b043d80b

Parents:

227a0eb5 (diff), 0d6549d8 (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/31/13 11:35:52)

git-committer:

Michael Niedermayer <michaelni@gmx.at> (08/31/13 11:36:01)

Message:

Merge commit '0d6549d8b57aaa5be8efb794154cdbe9a645910f'

• commit '0d6549d8b57aaa5be8efb794154cdbe9a645910f': pcm_bluray: rename pcm-mpeg.c to pcm-bluray.c

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

(No files)