[SCM] libav/experimental: cosmetics, reindent
siretart at users.alioth.debian.org
siretart at users.alioth.debian.org
Sun Jun 30 16:23:55 UTC 2013
The following commit has been merged in the experimental branch:
commit d2ce2f5e5c7578c29c87565937a841aeffe11e76
Author: Baptiste Coudurier <baptiste.coudurier at gmail.com>
Date: Sun Jun 22 01:36:15 2008 +0000
cosmetics, reindent
Originally committed as revision 13869 to svn://svn.ffmpeg.org/ffmpeg/trunk
diff --git a/ffmpeg.c b/ffmpeg.c
index e20ac11..456c7ad 100644
--- a/ffmpeg.c
+++ b/ffmpeg.c
@@ -1338,10 +1338,10 @@ static int output_packet(AVInputStream *ist, int ist_index,
else
opkt.pts= AV_NOPTS_VALUE;
- if (pkt->dts == AV_NOPTS_VALUE)
- opkt.dts = av_rescale_q(ist->next_pts, AV_TIME_BASE_Q, ost->st->time_base);
- else
- opkt.dts = av_rescale_q(pkt->dts, ist->st->time_base, ost->st->time_base);
+ if (pkt->dts == AV_NOPTS_VALUE)
+ opkt.dts = av_rescale_q(ist->next_pts, AV_TIME_BASE_Q, ost->st->time_base);
+ else
+ opkt.dts = av_rescale_q(pkt->dts, ist->st->time_base, ost->st->time_base);
opkt.duration = av_rescale_q(pkt->duration, ist->st->time_base, ost->st->time_base);
opkt.flags= pkt->flags;
--
Libav/FFmpeg packaging
More information about the pkg-multimedia-commits
mailing list