Changeset 0c8efe48 in ffmpeg

Timestamp:
Aug 1, 2013, 9:36:54 AM (11 years ago)
Author:
Michael Niedermayer <michaelni@gmx.at>
Branches:
master
Children:
57b8ce4
Parents:
b3264381 (diff), 45dd1ae1 (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 '45dd1ae1b3c18331f3db2293a9135bc5851e553f'

Conflicts:

libavfilter/buffer.c
libavfilter/internal.h

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

(No files)

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