Merge commit 'cfe64613923a2d47644a87386146ada1f9f6b659'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 22 Mar 2015 03:03:06 +0000 (04:03 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 22 Mar 2015 03:03:20 +0000 (04:03 +0100)
commitaa65ff2adffa550fecf010a839ad2318e32e1875
tree899c9aa7e819f8d070f3541854784f59ea45e2d2
parentcff55cfe17ec396dd88aea20566ec0b8f27f222c
parentcfe64613923a2d47644a87386146ada1f9f6b659
Merge commit 'cfe64613923a2d47644a87386146ada1f9f6b659'

* commit 'cfe64613923a2d47644a87386146ada1f9f6b659':
  avfilter: Document avfilter_graph_alloc return value

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