Changeset 2e5780a5 in ffmpeg

Timestamp:
Nov 23, 2013, 11:18:33 AM (11 years ago)
Author:
Michael Niedermayer <michaelni@gmx.at>
Branches:
master
Children:
2cbf27b0
Parents:
8733b363 (diff), b5328546 (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> (11/23/13 11:18:07)
git-committer:
Michael Niedermayer <michaelni@gmx.at> (11/23/13 11:18:33)
Message:

Merge commit 'b53285462263ef8a795f0e289abd5799b4c57652'

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

(No files)

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