]> git.sesse.net Git - vlc/commitdiff
x264: mention to remove kludge when 0 is a valid timestamp
authorRafaël Carré <rafael.carre@gmail.com>
Mon, 7 Dec 2009 16:53:36 +0000 (17:53 +0100)
committerRafaël Carré <rafael.carre@gmail.com>
Mon, 7 Dec 2009 16:53:36 +0000 (17:53 +0100)
modules/codec/x264.c

index 4dae35368a838f50f856d681a8770c5c4911212d..df3f7fe127c76e2b0f3e4cfdb5546c56f4a1f33c 100644 (file)
@@ -1253,6 +1253,7 @@ static block_t *Encode( encoder_t *p_enc, picture_t *p_pict )
         }
         else
         {
+#if 1       /* XXX: remove me when 0 is a valid timestamp (see #3135) */
             if( p_sys->i_interpolated_dts )
             {
                 p_block->i_dts = p_sys->i_interpolated_dts;
@@ -1262,7 +1263,9 @@ static block_t *Encode( encoder_t *p_enc, picture_t *p_pict )
                 /* Let's put something sensible */
                 p_block->i_dts = p_block->i_pts;
             }
-
+#else
+            p_block->i_dts = p_sys->i_interpolated_dts;
+#endif
             p_sys->i_interpolated_dts += p_block->i_length;
         }
     }