aboutsummaryrefslogtreecommitdiffstats
path: root/libavfilter/avfilter.h
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2015-01-21 21:30:48 +0100
committerMichael Niedermayer <michaelni@gmx.at>2015-01-21 21:35:11 +0100
commit5f764f43d27bdc18908868e01047b85da584d99b (patch)
tree97181596a1380298ff45b7cf87636d3385fc7d54 /libavfilter/avfilter.h
parentf30798584fd9709e83644f831107fdc9e26b1311 (diff)
parentda9bffaf08a1173451da1b4e1ae50881e7093642 (diff)
downloadffmpeg-5f764f43d27bdc18908868e01047b85da584d99b.tar.gz
Merge commit 'da9bffaf08a1173451da1b4e1ae50881e7093642'
* commit 'da9bffaf08a1173451da1b4e1ae50881e7093642': doc/platform: Reference only MSYS2 and MinGW-w64 Conflicts: doc/platform.texi See: 6c906ded380e9a11ff350c17f0e03271c8fb6154 Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavfilter/avfilter.h')
0 files changed, 0 insertions, 0 deletions