minimal_macosx: simplify killer thread loop

[vlc] / modules / demux / dirac.c

diff --git a/modules/demux/dirac.c b/modules/demux/dirac.c
index 82f8969c207215dc165f954eb4ac193c715ddfc1..48908330b2ed033c3665edf890469fd241bae882 100644 (file)
--- a/modules/demux/dirac.c
+++ b/modules/demux/dirac.c
@@ -1,25 +1,25 @@
 /*****************************************************************************
  * dirac.c : Dirac Video demuxer
  *****************************************************************************
- * Copyright (C) 2002-2008 the VideoLAN team
+ * Copyright (C) 2002-2008 VLC authors and VideoLAN
  * $Id$
  *
  * Authors: David Flynn <davidf@rd.bbc.co.uk>
  * Based on vc1.c by: Laurent Aimar <fenrir@via.ecp.fr>
  *
- * 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.
  *****************************************************************************/
 
 /*****************************************************************************
@@ -53,9 +53,10 @@ vlc_module_begin();
     set_subcategory( SUBCAT_INPUT_DEMUX );
     set_description( N_("Dirac video demuxer" ) );
     set_capability( "demux", 50 );
-    add_integer( DEMUX_CFG_PREFIX DEMUX_DTSOFFSET, 0, NULL,
+    add_integer( DEMUX_CFG_PREFIX DEMUX_DTSOFFSET, 0,
                  DEMUX_DTSOFFSET_TEXT, DEMUX_DTSOFFSET_LONGTEXT, false )
     set_callbacks( Open, Close );
+    add_shortcut( "dirac" )
 vlc_module_end();
 
 /*****************************************************************************
@@ -176,12 +177,7 @@ static int Demux( demux_t *p_demux)
             p_sys->i_state++;
             /* by default, timestamps are invalid.
              * Except when we need an anchor point */
-#if VLC_TS_INVALID == 0
-            /* xxx: to be removed in 1.1 */
-            p_block_in->i_dts = 1;
-#else
-            p_block_in->i_dts = 0;
-#endif
+            p_block_in->i_dts = VLC_TS_0;
         }
     }