diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-06-05 12:05:41 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-06-05 12:05:41 +0200 |
| commit | 2280b539c5050364d68e2cdbef2a0d3a7047544f (patch) | |
| tree | ce51863cf36ae5f0c8a2f56552d11592bd2b0145 /ffmpeg.c | |
| parent | 82070b01b85f200ec1a76064159f82626c167c12 (diff) | |
| parent | 8b7dffc2d6c6c19f8e0a1fedcd0e95dce7a273ff (diff) | |
Merge commit '8b7dffc2d6c6c19f8e0a1fedcd0e95dce7a273ff'
* commit '8b7dffc2d6c6c19f8e0a1fedcd0e95dce7a273ff':
lavfi doxy: improve/extend AVFilter doxy.
Conflicts:
libavfilter/avfilter.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'ffmpeg.c')
0 files changed, 0 insertions, 0 deletions