Changeset a7889492 in ffmpeg

Timestamp:

Dec 16, 2013, 9:07:24 PM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

a6738791

Parents:

792845e4 (diff), 6d3ea19 (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 '6d3ea1957f681b3bf9c752e6d21a501cc8d4180d'

• commit '6d3ea1957f681b3bf9c752e6d21a501cc8d4180d': Bump major of libavfilter for reference counted buffer API changes.

Conflicts:

libavfilter/version.h

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

(No files)