virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-10 06:10:52 +02:00
Code Issues Releases Activity

lavc/msmpeg4enc: use AVCodecContext.framerate when available

Browse Source
This commit is contained in:
Anton Khirnov
2023-05-04 11:45:29 +02:00
parent dc20baa049
commit 3fabf71207
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
libavcodec/msmpeg4enc.c
View File

@@ -280,7 +280,13 @@ void ff_msmpeg4_encode_picture_header(MpegEncContext * s)
void ff_msmpeg4_encode_ext_header(MpegEncContext * s) void ff_msmpeg4_encode_ext_header(MpegEncContext * s)
{ {
unsigned fps = s->avctx->time_base.den / s->avctx->time_base.num / FFMAX(s->avctx->ticks_per_frame, 1); unsigned fps;
if (s->avctx->framerate.num > 0 && s->avctx->framerate.den > 0)
fps = s->avctx->framerate.num / s->avctx->framerate.den;
else
fps = s->avctx->time_base.den / s->avctx->time_base.num / FFMAX(s->avctx->ticks_per_frame, 1);
put_bits(&s->pb, 5, FFMIN(fps, 31)); //yes 29.97 -> 29 put_bits(&s->pb, 5, FFMIN(fps, 31)); //yes 29.97 -> 29
put_bits(&s->pb, 11, FFMIN(s->bit_rate / 1024, 2047)); put_bits(&s->pb, 11, FFMIN(s->bit_rate / 1024, 2047));