Changeset baaa6d67 in ffmpeg

Timestamp:
Feb 15, 2014, 3:05:04 AM (11 years ago)
Author:
Michael Niedermayer <michaelni@gmx.at>
Branches:
master
Children:
d601106
Parents:
efe4a069 (diff), ba7dfe5c (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: lavfi doxy: add buffer{src,sink}.h to the main lavfi doxy group

Conflicts:

libavfilter/buffersink.h
libavfilter/buffersrc.h

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

(No files)

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