Merge svn changes up to r30694
commit0dce155dd3e52d24c7a0ffbd4be9461170d53de3
authorUoti Urpala <uau@glyph.nonexistent.invalid>
Tue, 9 Mar 2010 23:01:15 +0000 (10 01:01 +0200)
committerUoti Urpala <uau@glyph.nonexistent.invalid>
Tue, 9 Mar 2010 23:01:15 +0000 (10 01:01 +0200)
tree0d675e2bbd3fa90303f72708b8533d5d068278f4
parentdb7fe7ce92a229c6529b9b6b2894f325a778ead2
parent22e310b9aef77477e022874beb388514911ead1e
Merge svn changes up to r30694
libao2/ao_v4l2.c
libvo/vo_v4l2.c
libvo/vo_v4l2.h
stream/asf_mmst_streaming.c
stream/asf_streaming.c
stream/stream.h