bring into sync with changes

git-svn-id: https://mlt.svn.sourceforge.net/svnroot/mlt/trunk/mlt@212 d19143bc-622f-0410-bfdd-b5b2a6649095

diff --git a/demo/demo.ini b/demo/demo.ini
index 31d5b0fa8101abfbcd8ecfc65b9301f79e7d66d4..81c1930dbaeda601373470104a836a1a7a825ca6 100644 (file)
--- a/demo/demo.ini
+++ b/demo/demo.ini
@@ -4,8 +4,8 @@ mlt_watermark                           Watermark                                                       clip2.dv,watermark1.png
 mlt_my_name_is                         My name is...                                           clip3.dv
 mlt_composite_transition       A composite transition                          clip1.dv,clip2.mpeg
 mlt_fade_in_and_out                    Fade in and out                                         clip1.dv,clip2.mpeg,clip3.dv
-mlt_clock_in_and_out           Clock in and out                                        clip2.dv,clip1.dv,clip3.dv
-mlt_obscure                                    Obscure                                                         clip2.dv
+mlt_clock_in_and_out           Clock in and out                                        clip2.dv,clip1.dv,clip3.mpeg
+mlt_obscure                                    Obscure                                                         clip2.mpeg,circle.png
 mlt_audio_stuff                                Audio Stuff                                                     clip*.dv,music1.ogg
 mlt_levels                                     Audio and Video Levels                          clip*.dv
 mlt_titleshadow_watermark      Shadowed Title and Watermark            clip3.dv
@@ -15,4 +15,4 @@ mlt_avantika_title                    GJ-TTAvantika title                                     pango.westley
 mlt_title_over_gfx                     Title over graphic                                      watermark1.png,clip1.dv
 mlt_slideshow                          Slideshow                                                       Scotland
 mlt_bouncy                                     Bouncy, Bouncy                                          clip1.dv,clip3.dv
-mlt_bouncy_ball                                Bouncy, Bouncy Ball                                     clip1.dv,clip3.dv
+mlt_bouncy_ball                                Bouncy, Bouncy Ball                                     clip1.mpeg,clip3.mpeg,circle.png