Merge ../mlt++

[melted] / demo / demo.ini

diff --git a/demo/demo.ini b/demo/demo.ini
index 128821e..b01b049 100644 (file)
--- a/demo/demo.ini
+++ b/demo/demo.ini
@@ -16,7 +16,7 @@ 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.mpeg,clip3.mpeg,circle.png
-mlt_news                                       Breaking News                                           clip1.mpeg,clip2.mpeg
+mlt_news                                       Breaking News                                           clip1.dv,clip2.dv
 mlt_squeeze                                    Squeeze Transitions                                     clip1.dv,clip2.dv,clip3.dv
 mlt_squeeze_box                                Squeeze Box                                                     clip1.dv,clip2.dv,clip3.dv
 mlt_jcut                                       J Cut                                                           clip1.dv,clip2.dv
@@ -24,3 +24,5 @@ mlt_lcut                                      L Cut                                                           clip1.dv,clip2.dv
 mlt_fade_black                         Fade from/to black/silence                      clip3.mpeg
 mlt_push                                       Push wipe                                                       clip1.mpeg, clip2.mpeg
 mlt_ticker                                     Ticker tape                                                     clip1.dv
+mlt_attributes                         Attributes                                                      clip1.dv
+mlt_slideshow_black                    Composite slideshow                                     Scotland