virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

lavc: merge two if()s with the same condition.

Browse Source
This commit is contained in:
Anton Khirnov 2012-02-24 13:07:57 +01:00
parent d55fa6f9cb
commit 03ca0a5b30
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
libavcodec/utils.c
View File

@ -1112,10 +1112,9 @@ int attribute_align_arg avcodec_encode_video2(AVCodecContext *avctx,
avpkt->size = 0; avpkt->size = 0;
else if (!(avctx->codec->capabilities & CODEC_CAP_DELAY)) else if (!(avctx->codec->capabilities & CODEC_CAP_DELAY))
avpkt->pts = avpkt->dts = frame->pts; avpkt->pts = avpkt->dts = frame->pts;
}
if (!ret)
avctx->frame_number++; avctx->frame_number++;
}
emms_c(); emms_c();
return ret; return ret;