Merge commit 'origin/1.0-bugfix'
authorJean-Baptiste Kempf <jb@videolan.org>
Mon, 25 May 2009 23:57:08 +0000 (01:57 +0200)
committerJean-Baptiste Kempf <jb@videolan.org>
Mon, 25 May 2009 23:57:08 +0000 (01:57 +0200)
commit658686029ee756fbf4beb8e0cdcc4b0bc5dd18ed
treee73b0ddbbf70f98adde3219f89ca8cfda932cd18
parent13a41fa0f38f3932bc9ee721709cf20cc270ce6d
parentaeb955d83e1316d0fc99b586bde1be85eaacf427
Merge commit 'origin/1.0-bugfix'
NEWS
modules/video_output/snapshot.c
src/video_output/video_output.c
src/video_output/vout_pictures.c