summaryrefslogtreecommitdiff
path: root/libswresample
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2015-01-27 20:31:46 +0100
committerMichael Niedermayer <michaelni@gmx.at>2015-01-27 20:31:51 +0100
commitd3d4d98764ea18b3f192ea92b13ee075263b4387 (patch)
treeb3b696e8e0347c9f9962ec1763649193f7118030 /libswresample
parentc5b6b711b291f7cc3fc215de43896537cb7cfa44 (diff)
parent8805589b803fab5f362008306319336ac79a3fa7 (diff)
Merge commit '8805589b803fab5f362008306319336ac79a3fa7'
* commit '8805589b803fab5f362008306319336ac79a3fa7': libopencv: Rework error handling in parse_iplconvkernel() Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libswresample')
0 files changed, 0 insertions, 0 deletions