Changeset d52c5e9d in ffmpeg

Timestamp:

Jun 12, 2015, 7:34:22 PM (9 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

85d0df0c

Parents:

dbf172e6 (diff), 8606e88 (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> (06/12/15 19:33:53)

git-committer:

Michael Niedermayer <michaelni@gmx.at> (06/12/15 19:34:22)

Message:

Merge commit '8606e881b02bec2ac24943d22c8afe11d641fac8'

• commit '8606e881b02bec2ac24943d22c8afe11d641fac8': mpeg12: Move the vlc bits to a stand alone file

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

(No files)