[vlc-devel] commit: x264: mention to remove kludge when 0 is a valid timestamp ( Rafaël Carré )

[git version control]

vlc | branch: master | Rafaël Carré <rafael.carre at gmail.com> | Mon Dec  7 17:53:36 2009 +0100| [edfe05d1f2799b8ff28027cc6229cf28144488c6] | committer: Rafaël Carré 

x264: mention to remove kludge when 0 is a valid timestamp

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=edfe05d1f2799b8ff28027cc6229cf28144488c6
---

 modules/codec/x264.c |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/modules/codec/x264.c b/modules/codec/x264.c
index 4dae353..df3f7fe 100644
--- a/modules/codec/x264.c
+++ b/modules/codec/x264.c
@@ -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;
         }
     }