Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 15 Feb 2014 03:05:04 +0000 (04:05 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 15 Feb 2014 03:05:04 +0000 (04:05 +0100)
commitbaaa6d6785bca89683240a362eb8aee1fb97abcb
treea207ebd64e143b57c0387693c8269681e86e79dd
parentefe4a06929a885c740a255c42a746758cd60e97f
parentba7dfe5c50b2b618b54ff1e7c3972b07d172f163
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>
libavfilter/buffersink.h
libavfilter/buffersrc.h