[FFmpeg-cvslog] ffmpeg: remove trailing whitespace that sneaked into the previous merge

Hendrik Leppkes git at videolan.org
Wed Oct 14 14:52:56 CEST 2015


ffmpeg | branch: master | Hendrik Leppkes <h.leppkes at gmail.com> | Wed Oct 14 14:51:49 2015 +0200| [435dfc15dfa91681c0e3dc8bd42f92af6bec2c8f] | committer: Hendrik Leppkes

ffmpeg: remove trailing whitespace that sneaked into the previous merge

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=435dfc15dfa91681c0e3dc8bd42f92af6bec2c8f
---

 ffmpeg.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ffmpeg.c b/ffmpeg.c
index 1b36583..e121d55 100644
--- a/ffmpeg.c
+++ b/ffmpeg.c
@@ -3861,7 +3861,7 @@ static int process_input(int file_index)
                 pkt.pts -= av_rescale_q(delta, AV_TIME_BASE_Q, ist->st->time_base);
         }
     }
-    
+
     duration = av_rescale_q(ifile->duration, ifile->time_base, ist->st->time_base);
     if (pkt.pts != AV_NOPTS_VALUE) {
         pkt.pts += duration;



More information about the ffmpeg-cvslog mailing list