fix cf92821 merge issue
authorFlorent Kermarrec <florent@enjoy-digital.fr>
Fri, 19 Dec 2014 13:29:49 +0000 (14:29 +0100)
committerSebastien Bourdeauducq <sb@m-labs.hk>
Fri, 19 Dec 2014 13:49:49 +0000 (21:49 +0800)
commitceb675c3f139cab7a58bf0597d5401a7bc423dd6
tree83cc606115fe24ee92ae7ccfc1061661c91db8ef
parentaac34f011f37a7590b14c9e3f4169d9e73be670c
fix cf92821 merge issue
targets/mlabs_video.py