Swscale: init the pf_video_filter after possible fails

[vlc] / doc / demo.sh

diff --git a/doc/demo.sh b/doc/demo.sh
index 64909826b5985e3b3ccf72f92506c3b4042e9039..45fe55417063a3f91143f3fdfbccca4a9e80175e 100755 (executable)
--- a/doc/demo.sh
+++ b/doc/demo.sh
@@ -18,7 +18,7 @@ pyschedelic()
   echo -e "\n- Psychedelic demo -\nconfiguration\n"
   echo -en "Please choose an input. Live camera feeds are best.\ninput? "
   read input
-  echo -e "\n$VLC --sub-filter marq --marq-position 8 --marq-size 30 --marq-color 16776960 --marq-marquee \"VLC - Psychedelic video filter\" --vout-filter distort --distort-mode psychedelic $input"
+  echo -e "\n$VLC --sub-source marq --marq-position 8 --marq-size 30 --marq-color 16776960 --marq-marquee \"VLC - Psychedelic video filter\" --vout-filter distort --distort-mode psychedelic $input"
 }
 
 gradient()
@@ -33,7 +33,7 @@ setup a input $input
 setup a output #duplicate{dst=mosaic-bridge,select=video}
 control a play" > "`pwd`/demo.vlm"
   echo "VLM batch file saved to `pwd`/demo.vlm"
-  echo -e "\n$VLC --sub-filter mosaic:marq:logo --mosaic-width 120 --mosaic-height 90 --mosaic-cols 1 --mosaic-rows 1 --marq-position 8 --marq-size 30 --marq-color 65280 --marq-marquee \"VLC - Gradient video filter\" --logo-file $logofile --vout-filter distort --distort-mode gradient --extraintf telnet --telnet-host localhost --vlm-conf `pwd`/demo.vlm $input"
+  echo -e "\n$VLC --sub-source mosaic:marq:logo --mosaic-width 120 --mosaic-height 90 --mosaic-cols 1 --mosaic-rows 1 --marq-position 8 --marq-size 30 --marq-color 65280 --marq-marquee \"VLC - Gradient video filter\" --logo-file $logofile --vout-filter distort --distort-mode gradient --extraintf telnet --telnet-host localhost --vlm-conf `pwd`/demo.vlm $input"
 }
 
 mosaic()
@@ -48,15 +48,7 @@ setup a input $vid
 setup a output #duplicate{dst=mosaic-bridge,select=video}
 control a play" > "`pwd`/demo.vlm"
   echo "VLM batch file saved to `pwd`/demo.vlm"
-  echo -e "\n$VLC --sub-filter mosaic:marq --marq-marque \"VLC - mosaic\" --marq-position 6 --mosaic-width 120 --mosaic-height 90 --mosaic-rows 1 --mosaic-cols 1 --mosaic-alpha 150 --extraintf telnet --telnet-host localhost --vlm-conf `pwd`/demo.vlm $bg"
-}
-
-opengl()
-{
-  echo -e "\n- OpenGL cube demo -\nconfiguration\n"
-  echo -en "Please choose an input.\ninput? "
-  read input
-  echo -e "\n$VLC -V opengl --opengl-effect transparent-cube $input"
+  echo -e "\n$VLC --sub-source mosaic:marq --marq-marque \"VLC - mosaic\" --marq-position 6 --mosaic-width 120 --mosaic-height 90 --mosaic-rows 1 --mosaic-cols 1 --mosaic-alpha 150 --extraintf telnet --telnet-host localhost --vlm-conf `pwd`/demo.vlm $bg"
 }
 
 wall()
@@ -69,10 +61,10 @@ wall()
   case "$rot" in
     "y"|"Y"|"yes")
       echo -e "\nLeft hand side:\n$VLC --vout-filter wall:transform --transform-type 90 --wall-cols 2 --wall-rows 1 --wall-active 0 $input"
-      echo -e "\nRight hand side:\n$VLC --vout-filter wall:transform --transform-type 90 --wall-cols 2 --wall-rows 1 --wall-active 1 --sub-filter marq --marq-marquee \"VLC - Video wall\" $input"
+      echo -e "\nRight hand side:\n$VLC --vout-filter wall:transform --transform-type 90 --wall-cols 2 --wall-rows 1 --wall-active 1 --sub-source marq --marq-marquee \"VLC - Video wall\" $input"
       ;;
     *)
-      echo -e "\nLeft hand side:\n$VLC --vout-filter wall --wall-cols 2 --wall-rows 1 --wall-active 0 --sub-filter marq --marq-marquee \"VLC - Video wall\" $input"
+      echo -e "\nLeft hand side:\n$VLC --vout-filter wall --wall-cols 2 --wall-rows 1 --wall-active 0 --sub-source marq --marq-marquee \"VLC - Video wall\" $input"
       echo -e "\nRight hand side:\n$VLC --vout-filter wall --wall-cols 2 --wall-rows 1 --wall-active 1 $input"
       ;;
   esac
@@ -83,8 +75,7 @@ VLC cool demos script
  1. psychedelic video filter
  2. gradient video filter
  3. mosaic
- 4. OpenGL cube
- 5. video wall
+ 4. video wall
 EOF
 
 echo -n "demo number? "
@@ -94,8 +85,7 @@ case "$choice" in
  1) pyschedelic;;
  2) gradient;;
  3) mosaic;;
- 4) opengl;;
- 5) wall;;
+ 4) wall;;
  *) echo "Unrecognized input, please try again"; exit 1;;
 esac