The tension between the two companies – Apple and Adobe – can now begin to diminish as Adobe has revealed its plan to support streaming video on the iPad2 by adding support for Apple’s HTTP Live Streaming standard to its Flash Media Server product.

First, there was a blog post offering a sneak preview at the new streaming video features. Then it was previewed by the company at the National Association of Broadcasters trade show in LA. Kevin Towes, product manager for Adobe Flash Server, said:

The company is reducing the publishing complexity for broadcasters who need to reach browsers supporting HLS through HTML5 – such as Safari – or devices where Adobe Flash is not installed.

The move comes as a response to Apple’s iPhone and iPad sales. It looks as though Adobe had to step back so its announcement can be taken as small victory on Apple’s part. The tension has a long history, and it reached its peak last year, when Steve Jobs heavily criticized Adobe and Flash in an open letter. Jobs defended Apple’s decision not to support Flash on the iPhone, iPod touch and iPad, and highlighted six weak points of Flash – openness, the ‘full Web’ reliability, security and performance, battery life, touch, and the standard quality of third-party development tools.