Merge commit '8b7dffc2d6c6c19f8e0a1fedcd0e95dce7a273ff'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 5 Jun 2013 10:05:41 +0000 (12:05 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 5 Jun 2013 10:05:41 +0000 (12:05 +0200)
commit2280b539c5050364d68e2cdbef2a0d3a7047544f
treece51863cf36ae5f0c8a2f56552d11592bd2b0145
parent82070b01b85f200ec1a76064159f82626c167c12
parent8b7dffc2d6c6c19f8e0a1fedcd0e95dce7a273ff
Merge commit '8b7dffc2d6c6c19f8e0a1fedcd0e95dce7a273ff'

* commit '8b7dffc2d6c6c19f8e0a1fedcd0e95dce7a273ff':
  lavfi doxy: improve/extend AVFilter doxy.

Conflicts:
libavfilter/avfilter.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavfilter/avfilter.h