avconv: cosmetics, move code