Changeset 43935842 in ffmpeg

Timestamp:
Apr 9, 2014, 2:49:15 AM (11 years ago)
Author:
Michael Niedermayer <michaelni@gmx.at>
Branches:
master
Children:
62432798
Parents:
8f23045b (diff), 0d671ade (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> (04/09/14 02:40:39)
git-committer:
Michael Niedermayer <michaelni@gmx.at> (04/09/14 02:49:15)
Message:

Merge commit '0d671ade99059fd47b155df85c10c35eb6d54878'

Conflicts:

doc/encoders.texi

No change as we dont use a multitable for this list
we could of course switch to one though if it looks better
comments welcome

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

(No files)

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