From: Damien Fouilleul <damienf@videolan.org>
Date: Sun, 14 Jan 2007 20:35:11 +0000 (+0000)
Subject: - ffmpeg/encoder.c: more int64_t fixes
X-Git-Tag: 0.9.0-test0~8819
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=9a28f3c1df22174aff35a5fc3317a364c4e4c3ac;p=vlc

- ffmpeg/encoder.c: more int64_t fixes
---

diff --git a/modules/codec/ffmpeg/encoder.c b/modules/codec/ffmpeg/encoder.c
index 38386d65d7..29ff474f42 100644
--- a/modules/codec/ffmpeg/encoder.c
+++ b/modules/codec/ffmpeg/encoder.c
@@ -799,10 +799,10 @@ static block_t *EncodeVideo( encoder_t *p_enc, picture_t *p_pict )
     }
     else
     {
-        frame.pts = AV_NOPTS_VALUE;
+        frame.pts = (int64_t)AV_NOPTS_VALUE;
     }
 
-    if ( frame.pts != (int64_t)  AV_NOPTS_VALUE && frame.pts != 0 )
+    if ( frame.pts != (int64_t)AV_NOPTS_VALUE && frame.pts != 0 )
     {
         if ( p_sys->i_last_pts == frame.pts )
         {
@@ -852,7 +852,7 @@ static block_t *EncodeVideo( encoder_t *p_enc, picture_t *p_pict )
             /* No delay -> output pts == input pts */
             p_block->i_pts = p_block->i_dts = p_pict->date;
         }
-        else if( p_sys->p_context->coded_frame->pts != (signed int) AV_NOPTS_VALUE &&
+        else if( p_sys->p_context->coded_frame->pts != (int64_t)AV_NOPTS_VALUE &&
             p_sys->p_context->coded_frame->pts != 0 &&
             p_sys->i_buggy_pts_detect != p_sys->p_context->coded_frame->pts )
         {
@@ -861,11 +861,11 @@ static block_t *EncodeVideo( encoder_t *p_enc, picture_t *p_pict )
 
             /* Ugly work-around for stupid libavcodec behaviour */
             {
-            int64_t i_framenum = p_block->i_pts *
-                p_enc->fmt_in.video.i_frame_rate /
-                p_enc->fmt_in.video.i_frame_rate_base / AV_TIME_BASE;
+                int64_t i_framenum = p_block->i_pts *
+                    p_enc->fmt_in.video.i_frame_rate /
+                    p_enc->fmt_in.video.i_frame_rate_base / AV_TIME_BASE;
 
-            p_block->i_pts = p_sys->pi_delay_pts[i_framenum % MAX_FRAME_DELAY];
+                p_block->i_pts = p_sys->pi_delay_pts[i_framenum % MAX_FRAME_DELAY];
             }
             /* End work-around */