[vlc-commits] dcp: use __MAX to ensure the GET_TIME is positive

Steve Lhomme git at videolan.org
Tue Sep 18 16:42:42 CEST 2018


vlc | branch: master | Steve Lhomme <robux4 at ycbcr.xyz> | Thu May  3 09:50:06 2018 +0200| [aabc784a153623a33a41bcc2e0e26d0d125df76e] | committer: Steve Lhomme

dcp: use __MAX to ensure the GET_TIME is positive

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

 modules/access/dcp/dcp.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/access/dcp/dcp.cpp b/modules/access/dcp/dcp.cpp
index 075a89f43a..bcd3517517 100644
--- a/modules/access/dcp/dcp.cpp
+++ b/modules/access/dcp/dcp.cpp
@@ -821,7 +821,7 @@ static int Control( demux_t *p_demux, int query, va_list args )
 
         case DEMUX_GET_TIME:
             pi64 = va_arg( args, int64_t * );
-            *pi64 = p_sys->i_pts >= 0 ? p_sys->i_pts : 0;
+            *pi64 = __MAX(p_sys->i_pts, 0);
             break;
 
         case DEMUX_SET_TIME:



More information about the vlc-commits mailing list