Module: libav Branch: master Commit: 03ca0a5b3000d705aba86ea2184df47303851f65
Author: Anton Khirnov <[email protected]> Committer: Anton Khirnov <[email protected]> Date: Fri Feb 24 13:07:57 2012 +0100 lavc: merge two if()s with the same condition. --- libavcodec/utils.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/libavcodec/utils.c b/libavcodec/utils.c index 47cab41..e57f7ef 100644 --- a/libavcodec/utils.c +++ b/libavcodec/utils.c @@ -1112,10 +1112,9 @@ int attribute_align_arg avcodec_encode_video2(AVCodecContext *avctx, avpkt->size = 0; else if (!(avctx->codec->capabilities & CODEC_CAP_DELAY)) avpkt->pts = avpkt->dts = frame->pts; - } - if (!ret) avctx->frame_number++; + } emms_c(); return ret; _______________________________________________ libav-commits mailing list [email protected] https://lists.libav.org/mailman/listinfo/libav-commits
