Improve the unsupported codec errors

[vlc] / src / video_output / control.c

diff --git a/src/video_output/control.c b/src/video_output/control.c
index 64c96f676ccc877aceafa858d5c9936d3c0dd684..930e09b04ea9fd884c71774dd2ce821dcaeaf7cf 100644 (file)
--- a/src/video_output/control.c
+++ b/src/video_output/control.c
@@ -6,19 +6,19 @@
  *
  * Authors: Laurent Aimar <fenrir _AT_ videolan _DOT_ org>
  *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; either version 2.1 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
@@ -39,8 +39,13 @@ void vout_control_cmd_Init(vout_control_cmd_t *cmd, int type)
 void vout_control_cmd_Clean(vout_control_cmd_t *cmd)
 {
     switch (cmd->type) {
+    case VOUT_CONTROL_SUBPICTURE:
+        if (cmd->u.subpicture)
+            subpicture_Delete(cmd->u.subpicture);
+        break;
     case VOUT_CONTROL_OSD_TITLE:
     case VOUT_CONTROL_CHANGE_FILTERS:
+    case VOUT_CONTROL_CHANGE_SUB_SOURCES:
     case VOUT_CONTROL_CHANGE_SUB_FILTERS:
         free(cmd->u.string);
         break;
@@ -130,6 +135,14 @@ void vout_control_PushBool(vout_control_t *ctrl, int type, bool boolean)
     cmd.u.boolean = boolean;
     vout_control_Push(ctrl, &cmd);
 }
+void vout_control_PushInteger(vout_control_t *ctrl, int type, int integer)
+{
+    vout_control_cmd_t cmd;
+
+    vout_control_cmd_Init(&cmd, type);
+    cmd.u.integer = integer;
+    vout_control_Push(ctrl, &cmd);
+}
 void vout_control_PushTime(vout_control_t *ctrl, int type, mtime_t time)
 {
     vout_control_cmd_t cmd;