diff options
| author | Anton Khirnov <anton@khirnov.net> | 2012-02-24 13:07:57 +0100 |
|---|---|---|
| committer | Anton Khirnov <anton@khirnov.net> | 2012-02-25 07:48:52 +0100 |
| commit | 03ca0a5b3000d705aba86ea2184df47303851f65 (patch) | |
| tree | f2e189791d0a7000d0807a8490b3150d7c3571d8 | |
| parent | d55fa6f9cb1d374065229443fbb717f97df2110c (diff) | |
| download | ffmpeg-03ca0a5b3000d705aba86ea2184df47303851f65.tar.gz | |
lavc: merge two if()s with the same condition.
| -rw-r--r-- | libavcodec/utils.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/libavcodec/utils.c b/libavcodec/utils.c index 47cab4118b..e57f7ef130 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; |