Fixed commit 887b9eca023c94c26daf9607c7ac9b18172c634d

sorry, I found a possible problem in the avwrapper patch :(