[FFmpeg-cvslog] ffserver: drop unneeded else branching
Reynaldo H. Verdejo Pinochet
git at videolan.org
Mon Jun 22 00:06:25 CEST 2015
ffmpeg | branch: master | Reynaldo H. Verdejo Pinochet <reynaldo at osg.samsung.com> | Sun Jun 21 18:28:22 2015 -0300| [683f57354deb81897a1508b946bac6384088e3a8] | committer: Reynaldo H. Verdejo Pinochet
ffserver: drop unneeded else branching
Signed-off-by: Reynaldo H. Verdejo Pinochet <reynaldo at osg.samsung.com>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=683f57354deb81897a1508b946bac6384088e3a8
---
ffserver.c | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
diff --git a/ffserver.c b/ffserver.c
index 8687eba..3efa48b 100644
--- a/ffserver.c
+++ b/ffserver.c
@@ -2119,11 +2119,10 @@ static int64_t get_packet_send_clock(HTTPContext *c)
frame_bytes = c->cur_frame_bytes;
if (frame_bytes <= 0)
return c->cur_pts;
- else {
- bytes_left = c->buffer_end - c->buffer_ptr;
- bytes_sent = frame_bytes - bytes_left;
- return c->cur_pts + (c->cur_frame_duration * bytes_sent) / frame_bytes;
- }
+
+ bytes_left = c->buffer_end - c->buffer_ptr;
+ bytes_sent = frame_bytes - bytes_left;
+ return c->cur_pts + (c->cur_frame_duration * bytes_sent) / frame_bytes;
}
More information about the ffmpeg-cvslog
mailing list