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/libdav1d: fix exporting framerate

Browse Source 
Same issues as in the previous commit.
This commit is contained in:
Anton Khirnov
2023-05-04 10:54:52 +02:00
parent e10a5b91bc
commit 9d70e74d25
2 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libavcodec/Makefile
View File

@@ -1086,7 +1086,7 @@ OBJS-$(CONFIG_LIBARIBCAPTION_DECODER) += libaribcaption.o ass.o
OBJS-$(CONFIG_LIBCELT_DECODER) += libcelt_dec.o OBJS-$(CONFIG_LIBCELT_DECODER) += libcelt_dec.o
OBJS-$(CONFIG_LIBCODEC2_DECODER) += libcodec2.o OBJS-$(CONFIG_LIBCODEC2_DECODER) += libcodec2.o
OBJS-$(CONFIG_LIBCODEC2_ENCODER) += libcodec2.o OBJS-$(CONFIG_LIBCODEC2_ENCODER) += libcodec2.o
OBJS-$(CONFIG_LIBDAV1D_DECODER) += libdav1d.o OBJS-$(CONFIG_LIBDAV1D_DECODER) += libdav1d.o av1_parse.o
OBJS-$(CONFIG_LIBDAVS2_DECODER) += libdavs2.o OBJS-$(CONFIG_LIBDAVS2_DECODER) += libdavs2.o
OBJS-$(CONFIG_LIBFDK_AAC_DECODER) += libfdk-aacdec.o OBJS-$(CONFIG_LIBFDK_AAC_DECODER) += libfdk-aacdec.o
OBJS-$(CONFIG_LIBFDK_AAC_ENCODER) += libfdk-aacenc.o OBJS-$(CONFIG_LIBFDK_AAC_ENCODER) += libfdk-aacenc.o

10
libavcodec/libdav1d.c
View File

@@ -30,6 +30,7 @@
#include "libavutil/opt.h" #include "libavutil/opt.h"
#include "atsc_a53.h" #include "atsc_a53.h"
#include "av1_parse.h"
#include "avcodec.h" #include "avcodec.h"
#include "bytestream.h" #include "bytestream.h"
#include "codec_internal.h" #include "codec_internal.h"
@@ -154,12 +155,9 @@ static void libdav1d_init_params(AVCodecContext *c, const Dav1dSequenceHeader *s
else else
c->pix_fmt = pix_fmt[seq->layout][seq->hbd]; c->pix_fmt = pix_fmt[seq->layout][seq->hbd];
if (seq->num_units_in_tick && seq->time_scale) { c->framerate = ff_av1_framerate(seq->num_ticks_per_picture,
av_reduce(&c->framerate.den, &c->framerate.num, (unsigned)seq->num_units_in_tick,
seq->num_units_in_tick, seq->time_scale, INT_MAX); (unsigned)seq->time_scale);
if (seq->equal_picture_interval)
c->ticks_per_frame = seq->num_ticks_per_picture;
}
if (seq->film_grain_present) if (seq->film_grain_present)
c->properties |= FF_CODEC_PROPERTY_FILM_GRAIN; c->properties |= FF_CODEC_PROPERTY_FILM_GRAIN;