Merge commit 'abb5e37f64c48bba8bd0fde2bada0f7544defa24'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 10 Jan 2014 02:46:28 +0000 (03:46 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 10 Jan 2014 02:46:28 +0000 (03:46 +0100)
commitd9481dcd612b5f020e3c2137c301406a5eb1aa90
tree079ebab7bc934fa9a9695ca22b3e56e74fe1b26d
parent8788d316062e8afe456123a00c594e598fa80408
parentabb5e37f64c48bba8bd0fde2bada0f7544defa24
Merge commit 'abb5e37f64c48bba8bd0fde2bada0f7544defa24'

* commit 'abb5e37f64c48bba8bd0fde2bada0f7544defa24':
  avfilter: fix leaks on error in ff_filter_frame

Conflicts:
libavfilter/avfilter.c

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