Changeset dbfa4317 in ffmpeg

Timestamp:
Nov 14, 2013, 1:01:24 PM (11 years ago)
Author:
Michael Niedermayer <michaelni@gmx.at>
Branches:
master
Children:
9f32048d
Parents:
d67d3e29 (diff), b6094811 (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/14/13 12:49:31)
git-committer:
Michael Niedermayer <michaelni@gmx.at> (11/14/13 13:01:24)
Message:

Merge commit 'b6094811f9fca66cdf853420696e96fdc3e4987a'

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

(No files)

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