> -----Original Message-----
> From: ffmpeg-devel <ffmpeg-devel-boun...@ffmpeg.org> On Behalf Of Nicolas
> George
> Sent: Thursday, 19 August 2021 10:30
> To: FFmpeg development discussions and patches <ffmpeg-devel@ffmpeg.org>
> Subject: Re: [FFmpeg-devel] [PATCH 2/9] avfilter/subtitles: Add subtitles.c
>
> Soft Works (12021-08-19):
> > Signed-off-by: softworkz <softwo...@hotmail.com>
> > ---
> > libavfilter/Makefile | 1 +
> > libavfilter/internal.h | 8 ++++++
> > libavfilter/subtitles.c | 61 +++++++++++++++++++++++++++++++++++++++++
> > libavfilter/subtitles.h | 42 ++++++++++++++++++++++++++++
> > 4 files changed, 112 insertions(+)
> > create mode 100644 libavfilter/subtitles.c
> > create mode 100644 libavfilter/subtitles.h
>
> The change in internal.h is conflicting with Andrea's work.
You mean Andreas' work? Committed or uncommitted?
Regarding internal.h, my patch is on top of
"avfilter/avfilter: Remove unused feature to add pads in the middle"
515e7fbce1cc555d9eaadad798d3d968ff468987
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
To unsubscribe, visit link above, or email
ffmpeg-devel-requ...@ffmpeg.org with subject "unsubscribe".
