Changeset e925a82e in ffmpeg

Timestamp:

Jun 28, 2014, 10:33:07 AM (10 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

823ea19a

Parents:

504475f3 (diff), f134b5e (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 commit 'f134b5ec53b4cb51cb69bf0c64de87687ea72b12'

• commit 'f134b5ec53b4cb51cb69bf0c64de87687ea72b12': apichanges: fill in changes for lavu 51.19 and 51.20

Conflicts:

doc/APIchanges

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

(No files)