[vlc-commits] omxil: Only use pts if it actually is set

[Martin Storsjö]

vlc | branch: master | Martin Storsjö <martin at martin.st> | Thu Aug 30 00:44:42 2012 +0300| [1f18696f679fe520b64d60cb933fe50d3dfc3215] | committer: Jean-Baptiste Kempf

omxil: Only use pts if it actually is set

If we need to use pts for timestamps, but pts isn't set (the
avi demuxer seems to set it to 0 for cases where it isn't known, while
dts has a nonzero value), use dts instead.

This fixes things on OMAP4 (the only platform where b_use_pts is
set at the moment), when playing back files that have only dts,
no pts.

Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>

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

 modules/codec/omxil/omxil.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/codec/omxil/omxil.c b/modules/codec/omxil/omxil.c
index 3e44fb2..0e54611 100644
--- a/modules/codec/omxil/omxil.c
+++ b/modules/codec/omxil/omxil.c
@@ -1313,7 +1313,7 @@ static picture_t *DecodeVideo( decoder_t *p_dec, block_t **pp_block )
         p_header->nFilledLen = p_block->i_buffer;
         p_header->nOffset = 0;
         p_header->nFlags = OMX_BUFFERFLAG_ENDOFFRAME;
-        if (p_sys->b_use_pts)
+        if (p_sys->b_use_pts && p_block->i_pts)
             p_header->nTimeStamp = p_block->i_pts;
         else
             p_header->nTimeStamp = p_block->i_dts;