Changeset 03a5c44 in ffmpeg

Timestamp:

Dec 18, 2013, 6:54:04 PM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

cb079b1b

Parents:

d8b4ba3c (diff), fe533ffd (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.

Message:

Merge remote-tracking branch 'qatar/master'

• qatar/master: Prepare release notes for Libav 10 "Eks"

Conflicts:

doc/RELEASE_NOTES

Not merged because all that stuff has been in past releases

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

(No files)