Changeset 1c5aa64 in ffmpeg

Timestamp:
Jun 13, 2014, 12:40:50 AM (10 years ago)
Author:
Michael Niedermayer <michaelni@gmx.at>
Branches:
master
Children:
cf9050c7
Parents:
c5fc8ae1 (diff), 4321e507 (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/13/14 00:36:22)
git-committer:
Michael Niedermayer <michaelni@gmx.at> (06/13/14 00:40:50)
Message:

Merge commit '4321e507564b2d8a5dfc630f8d6fefba6fdc1e92'

Not merged as requested by carl
a patch to fix this has been posted by carl to ffmpeg-devel

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

(No files)

Note: See TracChangeset for help on using the changeset viewer.