Merge branch 'master' of git://git.videolan.org/vlc

[vlc] / modules / demux / dirac.c

diff --git a/modules/demux/dirac.c b/modules/demux/dirac.c
index 82f8969c207215dc165f954eb4ac193c715ddfc1..01d923dacf6e675aaac3b9ebed074115839d1bde 100644 (file)
--- a/modules/demux/dirac.c
+++ b/modules/demux/dirac.c
@@ -176,12 +176,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;
         }
     }