diff options
| author | Marton Balint <cus@passwd.hu> | 2023-01-24 00:35:54 +0100 |
|---|---|---|
| committer | Marton Balint <cus@passwd.hu> | 2023-02-13 00:36:46 +0100 |
| commit | 6b6f7db81932f94876ff4bcfd2da0582b8ab897e (patch) | |
| tree | 6aaa307f71042d91c6b19736f1cdc6498fd794e5 /libavcodec/encode.c | |
| parent | e506ea3ce1de0c782b2b833398240c8e19a02bb4 (diff) | |
| download | ffmpeg-6b6f7db81932f94876ff4bcfd2da0582b8ab897e.tar.gz | |
avcodec: add AVCodecContext.frame_num as 64 bit variant to frame_number
Frame counters can overflow relatively easily (INT_MAX number of frames is
slightly more than 1 year for 60 fps content), so make sure we use 64 bit
values for them.
Also deprecate the old 32 bit frame_number attribute.
Signed-off-by: Marton Balint <cus@passwd.hu>
Diffstat (limited to 'libavcodec/encode.c')
| -rw-r--r-- | libavcodec/encode.c | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/libavcodec/encode.c b/libavcodec/encode.c index 6499d962ca..041fc7670e 100644 --- a/libavcodec/encode.c +++ b/libavcodec/encode.c @@ -171,7 +171,12 @@ int avcodec_encode_subtitle(AVCodecContext *avctx, uint8_t *buf, int buf_size, } ret = ffcodec(avctx->codec)->cb.encode_sub(avctx, buf, buf_size, sub); - avctx->frame_number++; + avctx->frame_num++; +#if FF_API_AVCTX_FRAME_NUMBER +FF_DISABLE_DEPRECATION_WARNINGS + avctx->frame_number = avctx->frame_num; +FF_ENABLE_DEPRECATION_WARNINGS +#endif return ret; } @@ -503,7 +508,12 @@ int attribute_align_arg avcodec_send_frame(AVCodecContext *avctx, const AVFrame return ret; } - avctx->frame_number++; + avctx->frame_num++; +#if FF_API_AVCTX_FRAME_NUMBER +FF_DISABLE_DEPRECATION_WARNINGS + avctx->frame_number = avctx->frame_num; +FF_ENABLE_DEPRECATION_WARNINGS +#endif return 0; } |