diff options
| author | tytan652 | 2022-03-14 08:12:34 +0100 |
|---|---|---|
| committer | tytan652 | 2022-03-14 08:12:34 +0100 |
| commit | c9052dce05045a24f2ebfab3e572578c7152650f (patch) | |
| tree | e4aef8152920cf3a783c74e20d59c73ceac2f8b2 | |
| parent | ddf9fcd8d70295ae1a00bf8513698ca95caabc71 (diff) | |
| download | aur-c9052dce05045a24f2ebfab3e572578c7152650f.tar.gz | |
build: Update to 3.0.17.3
| -rw-r--r-- | .SRCINFO | 22 | ||||
| -rw-r--r-- | PKGBUILD | 22 | ||||
| -rw-r--r-- | av_init_packet.patch | 291 | ||||
| -rw-r--r-- | av_register_all.patch | 71 | ||||
| -rw-r--r-- | ffmpeg-5.0.patch | 496 | ||||
| -rw-r--r-- | fix-av_register_all-patch.patch | 43 | ||||
| -rw-r--r-- | pkt_timebase.patch | 34 | ||||
| -rw-r--r-- | vlc-3.0.11.1-srt_1.4.2.patch | 36 |
8 files changed, 10 insertions, 1005 deletions
@@ -1,7 +1,7 @@ pkgbase = vlc-luajit pkgdesc = Multi-platform MPEG, VCD/DVD, and DivX player built with luajit for OBS Studio compatibility - pkgver = 3.0.16 - pkgrel = 9 + pkgver = 3.0.17.3 + pkgrel = 1 url = https://www.videolan.org/vlc/ arch = i686 arch = x86_64 @@ -169,30 +169,18 @@ pkgbase = vlc-luajit optdepends = x264: H264 encoding optdepends = x265: HEVC/H.265 encoder optdepends = srt: SRT input/output plugin - provides = vlc=3.0.16 + provides = vlc=3.0.17.3 conflicts = vlc conflicts = vlc-dev conflicts = vlc-plugin conflicts = vlc-stable-git options = debug options = !emptydirs - source = https://download.videolan.org/vlc/3.0.16/vlc-3.0.16.tar.xz + source = https://download.videolan.org/vlc/3.0.17.3/vlc-3.0.17.3.tar.xz source = update-vlc-plugin-cache.hook - source = vlc-3.0.11.1-srt_1.4.2.patch source = vlc-live-media-2021.patch - source = pkt_timebase.patch - source = av_init_packet.patch - source = av_register_all.patch - source = fix-av_register_all-patch.patch - source = ffmpeg-5.0.patch - sha512sums = 35cdf191071224d0cf1b5a83c00773ff87b9e5bfcf0f5523f7edd53f75b23eda6b27bb49ffa97d69a1d176b8fe4786d959aeeb00d4380beab71c9f7e6b7c7298 + sha512sums = 99095b39ed600c3a89ebc0d377a2fc2522b3623a56b0f6de2df50a3c6e0148c67c28c0f2d8dec28bbdf5c62cf29b3579429a79ed00440570643778a9871022b6 sha512sums = b247510ffeadfd439a5dadd170c91900b6cdb05b5ca00d38b1a17c720ffe5a9f75a32e0cb1af5ebefdf1c23c5acc53513ed983a736e8fa30dd8fad237ef49dd3 - sha512sums = ac1d33d434aca2a0ad6e70800073deeaefc02b8fd72656b682ca833ee0cffe10dfa19a9355388700cab46ffbf9421c007d00ed04c7fa562698ff81e70db5f283 sha512sums = ad17d6f4f2cc83841c1c89623c339ec3ee94f6084ea980e2c8cbc3903854c85e5396e31bfd8dc90745b41794670903d854c4d282d8adec263087a9d47b226ccc - sha512sums = 0d42b78255ae0bd7720fc5c9087117c2dc51f511e9c1fe1161f2cd1949f11c6fb1197be0c6aa2151fcdfaebc0034518b902bdc29414aa7b5aa339b9911584bcb - sha512sums = bafaa841e4e12c1e645bd6753da0c8092f57efb1c157cb1a57e87e4677518d915b10a26c70552f04384305562a5bca3788caff4e262aa01b8d2ac7c85cdc3409 - sha512sums = 714187e2d495e3f4639942ab749002efd319f992cdc1e2664736fde1b5fc8d930d963372b4e55c93a232845aa9c18cf42b9241bea5d15155a193ad17ba574f4a - sha512sums = 638d6a4c5afc97038c01a6547edf316ead0357fb183689a387b36638f94c7b33e0197d5a260b5e06218b8d2862a099e4e9dfdec48303a0ce07b5c7f2c9c2e56c - sha512sums = d9c92bfddae34c680a5ba18a1858b5420096a8da459d676a9da167b4f07232b1e4fa49faffd7e489ad62d48cb33d1ddeeaba77c953a62bc838d4290b9a8b0db4 pkgname = vlc-luajit @@ -3,11 +3,11 @@ DISTRIB_ID=`lsb_release --id | cut -f2 -d$'\t'` pkgname=vlc-luajit -_vlcver=3.0.16 +_vlcver=3.0.17.3 # optional fixup version including hyphen _vlcfixupver= pkgver=${_vlcver}${_vlcfixupver//-/.r} -pkgrel=9 +pkgrel=1 pkgdesc='Multi-platform MPEG, VCD/DVD, and DivX player built with luajit for OBS Studio compatibility' url='https://www.videolan.org/vlc/' arch=('i686' 'x86_64' 'aarch64') @@ -166,22 +166,10 @@ provides=("${_name}=${pkgver}") options=('debug' '!emptydirs') source=(https://download.videolan.org/${_name}/${_vlcver}/${_name}-${_vlcver}${_vlcfixupver}.tar.xz 'update-vlc-plugin-cache.hook' - 'vlc-3.0.11.1-srt_1.4.2.patch' - 'vlc-live-media-2021.patch' - 'pkt_timebase.patch' - 'av_init_packet.patch' - 'av_register_all.patch' - 'fix-av_register_all-patch.patch' - 'ffmpeg-5.0.patch') -sha512sums=('35cdf191071224d0cf1b5a83c00773ff87b9e5bfcf0f5523f7edd53f75b23eda6b27bb49ffa97d69a1d176b8fe4786d959aeeb00d4380beab71c9f7e6b7c7298' + 'vlc-live-media-2021.patch') +sha512sums=('99095b39ed600c3a89ebc0d377a2fc2522b3623a56b0f6de2df50a3c6e0148c67c28c0f2d8dec28bbdf5c62cf29b3579429a79ed00440570643778a9871022b6' 'b247510ffeadfd439a5dadd170c91900b6cdb05b5ca00d38b1a17c720ffe5a9f75a32e0cb1af5ebefdf1c23c5acc53513ed983a736e8fa30dd8fad237ef49dd3' - 'ac1d33d434aca2a0ad6e70800073deeaefc02b8fd72656b682ca833ee0cffe10dfa19a9355388700cab46ffbf9421c007d00ed04c7fa562698ff81e70db5f283' - 'ad17d6f4f2cc83841c1c89623c339ec3ee94f6084ea980e2c8cbc3903854c85e5396e31bfd8dc90745b41794670903d854c4d282d8adec263087a9d47b226ccc' - '0d42b78255ae0bd7720fc5c9087117c2dc51f511e9c1fe1161f2cd1949f11c6fb1197be0c6aa2151fcdfaebc0034518b902bdc29414aa7b5aa339b9911584bcb' - 'bafaa841e4e12c1e645bd6753da0c8092f57efb1c157cb1a57e87e4677518d915b10a26c70552f04384305562a5bca3788caff4e262aa01b8d2ac7c85cdc3409' - '714187e2d495e3f4639942ab749002efd319f992cdc1e2664736fde1b5fc8d930d963372b4e55c93a232845aa9c18cf42b9241bea5d15155a193ad17ba574f4a' - '638d6a4c5afc97038c01a6547edf316ead0357fb183689a387b36638f94c7b33e0197d5a260b5e06218b8d2862a099e4e9dfdec48303a0ce07b5c7f2c9c2e56c' - 'd9c92bfddae34c680a5ba18a1858b5420096a8da459d676a9da167b4f07232b1e4fa49faffd7e489ad62d48cb33d1ddeeaba77c953a62bc838d4290b9a8b0db4') + 'ad17d6f4f2cc83841c1c89623c339ec3ee94f6084ea980e2c8cbc3903854c85e5396e31bfd8dc90745b41794670903d854c4d282d8adec263087a9d47b226ccc') if [[ $DISTRIB_ID == 'ManjaroLinux' ]]; then source+=( diff --git a/av_init_packet.patch b/av_init_packet.patch deleted file mode 100644 index 0833b858ce03..000000000000 --- a/av_init_packet.patch +++ /dev/null @@ -1,291 +0,0 @@ -From 37427cab7df0ec5611493a1207f69445853738ef Mon Sep 17 00:00:00 2001 -From: Ilkka Ollakka <ileoo@videolan.org> -Date: Wed, 7 Jul 2021 12:37:58 +0000 -Subject: [PATCH] avcodec: remove use of av_init_packet as it is deprecated in - new ffmpeg major version -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -av_init_packet is deprecated in new major version of ffmpeg. - -Also use av_packet_free instead of unref. - -Use av_packet_clone and AVPacket * in vlc_av_packet_t. - -(cherry picked from commit 16fd46fa506424134beb53ec88be3eea1b42a221) -Signed-off-by: Hugo Beauzée-Luyssen <hugo@beauzee.fr> ---- - modules/codec/avcodec/audio.c | 12 +++++++----- - modules/codec/avcodec/encoder.c | 25 ++++++++++++++----------- - modules/codec/avcodec/subtitle.c | 17 +++++++++++------ - modules/codec/avcodec/video.c | 30 +++++++++++++++++------------- - modules/demux/avformat/mux.c | 29 +++++++++++++++++------------ - 5 files changed, 66 insertions(+), 47 deletions(-) - -diff --git a/modules/codec/avcodec/audio.c b/modules/codec/avcodec/audio.c -index eec255ae0bd..8c3fa7a2179 100644 ---- a/modules/codec/avcodec/audio.c -+++ b/modules/codec/avcodec/audio.c -@@ -363,11 +363,13 @@ static int DecodeBlock( decoder_t *p_dec, block_t **pp_block ) - /* Feed in the loop as buffer could have been full on first iterations */ - if( p_block ) - { -- AVPacket pkt; -- av_init_packet( &pkt ); -- pkt.data = p_block->p_buffer; -- pkt.size = p_block->i_buffer; -- ret = avcodec_send_packet( ctx, &pkt ); -+ AVPacket *pkt = av_packet_alloc(); -+ if( !pkt ) -+ goto end; -+ pkt->data = p_block->p_buffer; -+ pkt->size = p_block->i_buffer; -+ ret = avcodec_send_packet( ctx, pkt ); -+ av_packet_free(&pkt); - if( ret == 0 ) /* Block has been consumed */ - { - /* Only set new pts from input block if it has been used, -diff --git a/modules/codec/avcodec/encoder.c b/modules/codec/avcodec/encoder.c -index b083d171f30..27af11a4127 100644 ---- a/modules/codec/avcodec/encoder.c -+++ b/modules/codec/avcodec/encoder.c -@@ -1061,14 +1061,14 @@ error: - typedef struct - { - block_t self; -- AVPacket packet; -+ AVPacket *packet; - } vlc_av_packet_t; - - static void vlc_av_packet_Release(block_t *block) - { - vlc_av_packet_t *b = (void *) block; - -- av_packet_unref(&b->packet); -+ av_packet_free( &b->packet ); - free(b); - } - -@@ -1089,7 +1089,7 @@ static block_t *vlc_av_packet_Wrap(AVPacket *packet, mtime_t i_length, AVCodecCo - block_Init( p_block, packet->data, packet->size ); - p_block->i_nb_samples = 0; - p_block->pf_release = vlc_av_packet_Release; -- b->packet = *packet; -+ b->packet = packet; - - p_block->i_length = i_length; - p_block->i_pts = packet->pts; -@@ -1138,11 +1138,13 @@ static void check_hurry_up( encoder_sys_t *p_sys, AVFrame *frame, encoder_t *p_e - - static block_t *encode_avframe( encoder_t *p_enc, encoder_sys_t *p_sys, AVFrame *frame ) - { -- AVPacket av_pkt; -- av_pkt.data = NULL; -- av_pkt.size = 0; -+ AVPacket *av_pkt = av_packet_alloc(); - -- av_init_packet( &av_pkt ); -+ if( !av_pkt ) -+ { -+ av_frame_unref( frame ); -+ return NULL; -+ } - - int ret = avcodec_send_frame( p_sys->p_context, frame ); - if( frame && ret != 0 && ret != AVERROR(EAGAIN) ) -@@ -1150,18 +1152,19 @@ static block_t *encode_avframe( encoder_t *p_enc, encoder_sys_t *p_sys, AVFrame - msg_Warn( p_enc, "cannot send one frame to encoder %d", ret ); - return NULL; - } -- ret = avcodec_receive_packet( p_sys->p_context, &av_pkt ); -+ ret = avcodec_receive_packet( p_sys->p_context, av_pkt ); - if( ret != 0 && ret != AVERROR(EAGAIN) ) - { - msg_Warn( p_enc, "cannot encode one frame" ); -+ av_packet_free( &av_pkt ); - return NULL; - } - -- block_t *p_block = vlc_av_packet_Wrap( &av_pkt, -- av_pkt.duration / p_sys->p_context->time_base.den, p_sys->p_context ); -+ block_t *p_block = vlc_av_packet_Wrap( av_pkt, -+ av_pkt->duration / p_sys->p_context->time_base.den, p_sys->p_context ); - if( unlikely(p_block == NULL) ) - { -- av_packet_unref( &av_pkt ); -+ av_packet_free( &av_pkt ); - return NULL; - } - return p_block; -diff --git a/modules/codec/avcodec/subtitle.c b/modules/codec/avcodec/subtitle.c -index 5cac6339d60..a17ba985e15 100644 ---- a/modules/codec/avcodec/subtitle.c -+++ b/modules/codec/avcodec/subtitle.c -@@ -186,16 +186,21 @@ static subpicture_t *DecodeBlock(decoder_t *dec, block_t **block_ptr) - AVSubtitle subtitle; - memset(&subtitle, 0, sizeof(subtitle)); - -- AVPacket pkt; -- av_init_packet(&pkt); -- pkt.data = block->p_buffer; -- pkt.size = block->i_buffer; -- pkt.pts = block->i_pts; -+ AVPacket *pkt = av_packet_alloc(); -+ if(!pkt) -+ { -+ block_Release(block); -+ return NULL; -+ } -+ pkt->data = block->p_buffer; -+ pkt->size = block->i_buffer; -+ pkt->pts = block->i_pts; - - int has_subtitle = 0; - int used = avcodec_decode_subtitle2(sys->p_context, -- &subtitle, &has_subtitle, &pkt); -+ &subtitle, &has_subtitle, pkt); - -+ av_packet_free(&pkt); - if (used < 0) { - msg_Warn(dec, "cannot decode one subtitle (%zu bytes)", - block->i_buffer); -diff --git a/modules/codec/avcodec/video.c b/modules/codec/avcodec/video.c -index b99eb56e4a7..2b1e3ad314a 100644 ---- a/modules/codec/avcodec/video.c -+++ b/modules/codec/avcodec/video.c -@@ -1015,14 +1015,18 @@ static picture_t *DecodeBlock( decoder_t *p_dec, block_t **pp_block, bool *error - - if( b_has_data || b_start_drain ) - { -- AVPacket pkt; -- av_init_packet( &pkt ); -+ AVPacket *pkt = av_packet_alloc(); -+ if(!pkt) -+ { -+ *error = true; -+ break; -+ } - if( b_has_data ) - { -- pkt.data = p_block->p_buffer; -- pkt.size = p_block->i_buffer; -- pkt.pts = p_block->i_pts > VLC_TS_INVALID ? p_block->i_pts : AV_NOPTS_VALUE; -- pkt.dts = p_block->i_dts > VLC_TS_INVALID ? p_block->i_dts : AV_NOPTS_VALUE; -+ pkt->data = p_block->p_buffer; -+ pkt->size = p_block->i_buffer; -+ pkt->pts = p_block->i_pts > VLC_TS_INVALID ? p_block->i_pts : AV_NOPTS_VALUE; -+ pkt->dts = p_block->i_dts > VLC_TS_INVALID ? p_block->i_dts : AV_NOPTS_VALUE; - - /* Make sure we don't reuse the same timestamps twice */ - p_block->i_pts = -@@ -1031,21 +1035,21 @@ static picture_t *DecodeBlock( decoder_t *p_dec, block_t **pp_block, bool *error - else /* start drain */ - { - /* Return delayed frames if codec has CODEC_CAP_DELAY */ -- pkt.data = NULL; -- pkt.size = 0; -+ pkt->data = NULL; -+ pkt->size = 0; - p_sys->b_draining = true; - } - - if( !p_sys->palette_sent ) - { -- uint8_t *pal = av_packet_new_side_data(&pkt, AV_PKT_DATA_PALETTE, AVPALETTE_SIZE); -+ uint8_t *pal = av_packet_new_side_data(pkt, AV_PKT_DATA_PALETTE, AVPALETTE_SIZE); - if (pal) { - memcpy(pal, p_dec->fmt_in.video.p_palette->palette, AVPALETTE_SIZE); - p_sys->palette_sent = true; - } - } - -- ret = avcodec_send_packet(p_context, &pkt); -+ ret = avcodec_send_packet(p_context, pkt); - if( ret != 0 && ret != AVERROR(EAGAIN) ) - { - if (ret == AVERROR(ENOMEM) || ret == AVERROR(EINVAL)) -@@ -1053,11 +1057,11 @@ static picture_t *DecodeBlock( decoder_t *p_dec, block_t **pp_block, bool *error - msg_Err(p_dec, "avcodec_send_packet critical error"); - *error = true; - } -- av_packet_unref( &pkt ); -+ av_packet_free( &pkt ); - break; - } -- i_used = ret != AVERROR(EAGAIN) ? pkt.size : 0; -- av_packet_unref( &pkt ); -+ i_used = ret != AVERROR(EAGAIN) ? pkt->size : 0; -+ av_packet_free( &pkt ); - } - - AVFrame *frame = av_frame_alloc(); -diff --git a/modules/demux/avformat/mux.c b/modules/demux/avformat/mux.c -index 48878c712b3..405a6f6933c 100644 ---- a/modules/demux/avformat/mux.c -+++ b/modules/demux/avformat/mux.c -@@ -341,14 +341,16 @@ static int MuxBlock( sout_mux_t *p_mux, sout_input_t *p_input ) - block_t *p_data = block_FifoGet( p_input->p_fifo ); - int i_stream = *((int *)p_input->p_sys); - AVStream *p_stream = p_sys->oc->streams[i_stream]; -- AVPacket pkt; -- -- memset( &pkt, 0, sizeof(AVPacket) ); -+ AVPacket *pkt = av_packet_alloc(); -+ if( !pkt ) -+ { -+ block_Release( p_data ); -+ return VLC_EGENERIC; -+ } - -- av_init_packet(&pkt); -- pkt.data = p_data->p_buffer; -- pkt.size = p_data->i_buffer; -- pkt.stream_index = i_stream; -+ pkt->data = p_data->p_buffer; -+ pkt->size = p_data->i_buffer; -+ pkt->stream_index = i_stream; - - if( p_data->i_flags & BLOCK_FLAG_TYPE_I ) - { -@@ -359,29 +361,32 @@ static int MuxBlock( sout_mux_t *p_mux, sout_input_t *p_input ) - #endif - - p_sys->b_write_keyframe = true; -- pkt.flags |= AV_PKT_FLAG_KEY; -+ pkt->flags |= AV_PKT_FLAG_KEY; - } - - if( p_data->i_pts > 0 ) -- pkt.pts = p_data->i_pts * p_stream->time_base.den / -+ pkt->pts = p_data->i_pts * p_stream->time_base.den / - CLOCK_FREQ / p_stream->time_base.num; - if( p_data->i_dts > 0 ) -- pkt.dts = p_data->i_dts * p_stream->time_base.den / -+ pkt->dts = p_data->i_dts * p_stream->time_base.den / - CLOCK_FREQ / p_stream->time_base.num; - - /* this is another hack to prevent libavformat from triggering the "non monotone timestamps" check in avformat/utils.c */ - p_stream->cur_dts = ( p_data->i_dts * p_stream->time_base.den / - CLOCK_FREQ / p_stream->time_base.num ) - 1; - -- if( av_write_frame( p_sys->oc, &pkt ) < 0 ) -+ if( av_write_frame( p_sys->oc, pkt ) < 0 ) - { - msg_Err( p_mux, "could not write frame (pts: %"PRId64", dts: %"PRId64") " - "(pkt pts: %"PRId64", dts: %"PRId64")", -- p_data->i_pts, p_data->i_dts, pkt.pts, pkt.dts ); -+ p_data->i_pts, p_data->i_dts, pkt->pts, pkt->dts ); - block_Release( p_data ); -+ av_packet_unref( pkt ); - return VLC_EGENERIC; - } - -+ -+ av_packet_unref( pkt ); - block_Release( p_data ); - return VLC_SUCCESS; - } --- -GitLab - diff --git a/av_register_all.patch b/av_register_all.patch deleted file mode 100644 index 649dfcf40672..000000000000 --- a/av_register_all.patch +++ /dev/null @@ -1,71 +0,0 @@ -From 0094e5b4214cade58303cf315ce4c128d76f9e32 Mon Sep 17 00:00:00 2001 -From: Alexandre Janniaux <ajanni@videolabs.io> -Date: Wed, 8 Apr 2020 15:07:15 +0200 -Subject: [PATCH] avcodec: remove deprecation warning for av*_register_all -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -From doc/APIchanges: - - 2018-02-06 - 0694d87024 - lavf 58.9.100 - avformat.h - Deprecate use of av_register_input_format(), av_register_output_format(), - av_register_all(), av_iformat_next(), av_oformat_next(). - Add av_demuxer_iterate(), and av_muxer_iterate(). - - 2018-02-06 - 36c85d6e77 - lavc 58.10.100 - avcodec.h - Deprecate use of avcodec_register(), avcodec_register_all(), - av_codec_next(), av_register_codec_parser(), and av_parser_next(). - Add av_codec_iterate() and av_parser_iterate(). - -They are no-op since those updates. If compiling with a recent release, -just don't call av*_register_all to prevent warnings. - -(cherry picked from commit 21d5a1933275edb7f67d05ea62a762464e07c2cb) -Signed-off-by: Hugo Beauzée-Luyssen <hugo@beauzee.fr> ---- - modules/codec/avcodec/avcommon.h | 6 ++++++ - 1 file changed, 6 insertions(+) - -diff --git a/modules/codec/avcodec/avcommon.h b/modules/codec/avcodec/avcommon.h -index 8c8298014ff..158c01e3201 100644 ---- a/modules/codec/avcodec/avcommon.h -+++ b/modules/codec/avcodec/avcommon.h -@@ -97,6 +97,7 @@ static inline void vlc_init_avutil(vlc_object_t *obj) - - #ifdef HAVE_LIBAVFORMAT_AVFORMAT_H - # include <libavformat/avformat.h> -+# include <libavformat/version.h> - static inline void vlc_init_avformat(vlc_object_t *obj) - { - vlc_avcodec_lock(); -@@ -105,7 +106,9 @@ static inline void vlc_init_avformat(vlc_object_t *obj) - - avformat_network_init(); - -+#if (LIBAVFORMAT_VERSION_MICRO >= 100) && (LIBAVFORMAT_VERSION_INT < AV_VERSION_INT(58, 9, 100)) - av_register_all(); -+#endif - - vlc_avcodec_unlock(); - } -@@ -113,13 +116,16 @@ static inline void vlc_init_avformat(vlc_object_t *obj) - - #ifdef HAVE_LIBAVCODEC_AVCODEC_H - # include <libavcodec/avcodec.h> -+# include <libavcodec/version.h> - static inline void vlc_init_avcodec(vlc_object_t *obj) - { - vlc_avcodec_lock(); - - vlc_init_avutil(obj); - -+#if (LIBAVFORMAT_VERSION_MICRO >= 100) && (LIBAVCODEC_VERSION_INT < AV_VERSION_INT(58, 10, 100)) - avcodec_register_all(); -+#endif - - vlc_avcodec_unlock(); - } --- -GitLab - diff --git a/ffmpeg-5.0.patch b/ffmpeg-5.0.patch deleted file mode 100644 index 53478148da1b..000000000000 --- a/ffmpeg-5.0.patch +++ /dev/null @@ -1,496 +0,0 @@ -From 66b647fd696b7f449b09b200f4028789c2d210a8 Mon Sep 17 00:00:00 2001 -From: Romain Vimont <rom1v@videolabs.io> -Date: Tue, 18 Jan 2022 15:43:27 +0100 -Subject: [PATCH 1/9] avformat: adapt AVOutputFormat API constification - -Refs ffmpeg/56450a0ee4fdda160f4039fc2ae33edfd27765c9 - -(cherry picked from commit d0710040f0749a74a66aa19976ab1c0edbab0b0b) - -The condition has been adapted from the original commit because VLC3 -supports both ffmpeg and libav contrary to VLC4. ---- - modules/demux/avformat/mux.c | 5 +++++ - 1 file changed, 5 insertions(+) - -diff --git a/modules/demux/avformat/mux.c b/modules/demux/avformat/mux.c -index 0b00640bafb..e6260e36885 100644 ---- a/modules/demux/avformat/mux.c -+++ b/modules/demux/avformat/mux.c -@@ -86,7 +86,12 @@ static int IOWriteTyped(void *opaque, uint8_t *buf, int buf_size, - *****************************************************************************/ - int avformat_OpenMux( vlc_object_t *p_this ) - { -+#if LIBAVFORMAT_VERSION_MICRO >= 100 && \ -+ LIBAVFORMAT_VERSION_INT >= AV_VERSION_INT(59, 0, 100) -+ const AVOutputFormat *file_oformat; -+#else - AVOutputFormat *file_oformat; -+#endif - sout_mux_t *p_mux = (sout_mux_t*)p_this; - bool dummy = !strcmp( p_mux->p_access->psz_access, "dummy"); - --- -GitLab - - -From 591f658223bb6320ea61248976753e20a985c8dc Mon Sep 17 00:00:00 2001 -From: Romain Vimont <rom1v@videolabs.io> -Date: Wed, 19 Jan 2022 15:00:21 +0100 -Subject: [PATCH 2/9] avformat: adapt AVInputFormat API constification - -Refs ffmpeg/56450a0ee4fdda160f4039fc2ae33edfd27765c9 - -(cherry picked from commit 5069e1cc38fe25e40d8e58ddb387c92da1bef793) - -The condition has been adapted from the original commit because VLC3 -supports both ffmpeg and libav contrary to VLC4. ---- - modules/demux/avformat/demux.c | 11 +++++++++-- - 1 file changed, 9 insertions(+), 2 deletions(-) - -diff --git a/modules/demux/avformat/demux.c b/modules/demux/avformat/demux.c -index 867b4fe0374..7b3f6adcd3a 100644 ---- a/modules/demux/avformat/demux.c -+++ b/modules/demux/avformat/demux.c -@@ -52,6 +52,13 @@ - - # define HAVE_AVUTIL_CODEC_ATTACHMENT 1 - -+#if LIBAVFORMAT_VERSION_MICRO >= 100 && \ -+ LIBAVFORMAT_VERSION_INT >= AV_VERSION_INT(59, 0, 100) -+# define AVF_MAYBE_CONST const -+#else -+# define AVF_MAYBE_CONST -+#endif -+ - struct avformat_track_s - { - es_out_id_t *p_es; -@@ -63,7 +70,7 @@ struct avformat_track_s - *****************************************************************************/ - struct demux_sys_t - { -- AVInputFormat *fmt; -+ AVF_MAYBE_CONST AVInputFormat *fmt; - AVFormatContext *ic; - - struct avformat_track_s *tracks; -@@ -154,7 +161,7 @@ int avformat_OpenDemux( vlc_object_t *p_this ) - demux_t *p_demux = (demux_t*)p_this; - demux_sys_t *p_sys; - AVProbeData pd = { }; -- AVInputFormat *fmt = NULL; -+ AVF_MAYBE_CONST AVInputFormat *fmt = NULL; - int64_t i_start_time = -1; - bool b_can_seek; - char *psz_url; --- -GitLab - - -From 07e0beb5b6ecccb2cde134f3a3bd45071bce0dae Mon Sep 17 00:00:00 2001 -From: Romain Vimont <rom1v@videolabs.io> -Date: Tue, 18 Jan 2022 15:16:39 +0100 -Subject: [PATCH 3/9] avcodec: adapt AVCodec API constification - -Refs ffmpeg/626535f6a169e2d821b969e0ea77125ba7482113 - -(cherry picked from 3312a960cb5a218d47c0a23405aff6c2688f8320) - -The condition has been adapted from the original commit because VLC3 -supports both ffmpeg and libav contrary to VLC4. ---- - modules/codec/avcodec/encoder.c | 13 ++++++++++--- - 1 file changed, 10 insertions(+), 3 deletions(-) - -diff --git a/modules/codec/avcodec/encoder.c b/modules/codec/avcodec/encoder.c -index c10f44c0c28..74e6fe18224 100644 ---- a/modules/codec/avcodec/encoder.c -+++ b/modules/codec/avcodec/encoder.c -@@ -60,6 +60,13 @@ - - #define RAW_AUDIO_FRAME_SIZE (2048) - -+#if LIBAVCODEC_VERSION_MICRO >= 100 && \ -+ LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(59, 0, 100) -+# define AVC_MAYBE_CONST const -+#else -+# define AVC_MAYBE_CONST -+#endif -+ - /***************************************************************************** - * Local prototypes - *****************************************************************************/ -@@ -93,7 +100,7 @@ struct encoder_sys_t - /* - * libavcodec properties - */ -- AVCodec *p_codec; -+ AVC_MAYBE_CONST AVCodec *p_codec; - AVCodecContext *p_context; - - /* -@@ -234,7 +241,7 @@ static const int DEFAULT_ALIGN = 0; - /***************************************************************************** - * InitVideoEnc: probe the encoder - *****************************************************************************/ --static void probe_video_frame_rate( encoder_t *p_enc, AVCodecContext *p_context, AVCodec *p_codec ) -+static void probe_video_frame_rate( encoder_t *p_enc, AVCodecContext *p_context, AVC_MAYBE_CONST AVCodec *p_codec ) - { - /* if we don't have i_frame_rate_base, we are probing and just checking if we can find codec - * so set fps to requested fps if asked by user or input fps is availabled */ -@@ -296,7 +303,7 @@ int InitVideoEnc( vlc_object_t *p_this ) - encoder_t *p_enc = (encoder_t *)p_this; - encoder_sys_t *p_sys; - AVCodecContext *p_context; -- AVCodec *p_codec = NULL; -+ AVC_MAYBE_CONST AVCodec *p_codec = NULL; - unsigned i_codec_id; - const char *psz_namecodec; - float f_val; --- -GitLab - - -From abb201b79367311e43e619dcda3d4a9348da42ec Mon Sep 17 00:00:00 2001 -From: Romain Vimont <rom1v@videolabs.io> -Date: Tue, 18 Jan 2022 15:08:38 +0100 -Subject: [PATCH 4/9] avcodec: do not use field removed in API 60 - -AVCodecContext.thread_safe_callbacks will be removed in API 60: - -> Thread-unsafe get_buffer2() implementations will be invalid starting -> with LIBAVCODEC_VERSION_MAJOR=60; in other words, libavcodec will -> behave as if this field was always set to 1. - -In current FFmpeg 5.0 (API 59), we must still set the variable, and it -is already deprecated, so we can't get rid of the deprecation warning. - -ffmpeg/a83098ab03a47179d54a9b9c8bcefc81b9c6aafd (deprecation) -ffmpeg/54e5d21acabb452e5680de5db3bf7567d351d68e (doc) - -(cherry picked from commit 02e8981b57c647641b188f8612a6e4b1e31a660a) ---- - modules/codec/avcodec/video.c | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/modules/codec/avcodec/video.c b/modules/codec/avcodec/video.c -index 2b1e3ad314a..e0137315409 100644 ---- a/modules/codec/avcodec/video.c -+++ b/modules/codec/avcodec/video.c -@@ -573,7 +573,9 @@ int InitVideoDec( vlc_object_t *obj ) - i_thread_count = __MIN( i_thread_count, p_codec->id == AV_CODEC_ID_HEVC ? 32 : 16 ); - msg_Dbg( p_dec, "allowing %d thread(s) for decoding", i_thread_count ); - p_context->thread_count = i_thread_count; -+#if LIBAVCODEC_VERSION_MAJOR < 60 - p_context->thread_safe_callbacks = true; -+#endif - - switch( p_codec->id ) - { --- -GitLab - - -From bd8533e0c8b50773e49be8f8b5b61a9782de386f Mon Sep 17 00:00:00 2001 -From: Romain Vimont <rom1v@videolabs.io> -Date: Tue, 18 Jan 2022 15:06:28 +0100 -Subject: [PATCH 5/9] avcodec: fix condition to use AVFrame.pkt_pts - -The field AVFrame.pkt_pts was removed in lavc 56.24.0 / 57.61.100: - -> Decoders now export the frame timestamp as AVFrame.pts. It was -> previously exported as AVFrame.pkt_pts, which is now deprecated. - -Fix the inverted deprecation check and use LIBAVCODEC_VERSION_CHECK() to -target the exact version. - -Refs vlc4/991ba74b018a201cc6cc73da713fb3d62fd7ff60 -Refs ffmpeg/32c8359093d1ff4f45ed19518b449b3ac3769d27 (deprecation) -Refs ffmpeg/6e30b35b85b81c802e52a1078ec7a3097e353c6d (removal) ---- - modules/codec/avcodec/video.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/modules/codec/avcodec/video.c b/modules/codec/avcodec/video.c -index e0137315409..adb529354d1 100644 ---- a/modules/codec/avcodec/video.c -+++ b/modules/codec/avcodec/video.c -@@ -1116,7 +1116,7 @@ static picture_t *DecodeBlock( decoder_t *p_dec, block_t **pp_block, bool *error - } - - /* Compute the PTS */ --#ifdef FF_API_PKT_PTS -+#if LIBAVCODEC_VERSION_CHECK(57, 24, 0, 61, 100) - mtime_t i_pts = frame->pts; - #else - mtime_t i_pts = frame->pkt_pts; --- -GitLab - - -From 781082eea3c3aea140c6725d7405cdf09124e190 Mon Sep 17 00:00:00 2001 -From: Romain Vimont <rom1v@videolabs.io> -Date: Tue, 18 Jan 2022 15:12:26 +0100 -Subject: [PATCH 6/9] avcodec: replace removed FMT_VAAPI_VLD enum value - -Replace AV_PIX_FMT_VAAPI_VLD by AV_PIX_FMT_VAAPI. - -libav/d264c720f7b74286840719e506daba39f83b438b (deprecation) -ffmpeg/9f8e57efe4400ca86352277873792792279c3b15 (deprecation) -ffmpeg/ad524cb9eeb298f7a60d923094fbebb1fda7e0e3 (removal) ---- - modules/codec/avcodec/avcommon_compat.h | 10 ++++++++++ - modules/codec/avcodec/va.c | 2 +- - modules/codec/avcodec/vaapi.c | 4 ++-- - modules/codec/avcodec/video.c | 2 +- - 4 files changed, 14 insertions(+), 4 deletions(-) - -diff --git a/modules/codec/avcodec/avcommon_compat.h b/modules/codec/avcodec/avcommon_compat.h -index 8f9c12081cf..9d16b3dc47d 100644 ---- a/modules/codec/avcodec/avcommon_compat.h -+++ b/modules/codec/avcodec/avcommon_compat.h -@@ -95,6 +95,16 @@ - # define AV_PIX_FMT_FLAG_HWACCEL PIX_FMT_HWACCEL - #endif - -+/* -+ * AV_PIX_FMT_VAAPI is not introduced in the same major version in libav and FFmpeg: -+ * - libav: lavu 55.8.0: libav/d264c720f7b74286840719e506daba39f83b438b -+ * - ffmpeg: lavu 54.31.100: ffmpeg/9f8e57efe4400ca86352277873792792279c3b15 -+ */ -+#if ( (LIBAVUTIL_VERSION_MICRO < 100 && LIBAVUTIL_VERSION_INT < AV_VERSION_INT( 55, 8, 0 ) ) || \ -+ (LIBAVUTIL_VERSION_MICRO >= 100 && LIBAVUTIL_VERSION_INT < AV_VERSION_INT( 54, 31, 100 ) ) ) -+# define AV_PIX_FMT_VAAPI AV_PIX_FMT_VAAPI_VLD -+#endif -+ - #endif /* HAVE_LIBAVUTIL_AVUTIL_H */ - - #if LIBAVUTIL_VERSION_MAJOR >= 55 -diff --git a/modules/codec/avcodec/va.c b/modules/codec/avcodec/va.c -index 05831232d29..beedcc6027d 100644 ---- a/modules/codec/avcodec/va.c -+++ b/modules/codec/avcodec/va.c -@@ -37,7 +37,7 @@ vlc_fourcc_t vlc_va_GetChroma(enum PixelFormat hwfmt, enum PixelFormat swfmt) - * fatal, especially not if a software format. */ - switch (hwfmt) - { -- case AV_PIX_FMT_VAAPI_VLD: -+ case AV_PIX_FMT_VAAPI: - switch (swfmt) - { - case AV_PIX_FMT_YUVJ420P: -diff --git a/modules/codec/avcodec/vaapi.c b/modules/codec/avcodec/vaapi.c -index 35e6c47263e..3675d2fc799 100644 ---- a/modules/codec/avcodec/vaapi.c -+++ b/modules/codec/avcodec/vaapi.c -@@ -154,7 +154,7 @@ static void Delete(vlc_va_t *va, void **hwctx) - static int Create(vlc_va_t *va, AVCodecContext *ctx, enum PixelFormat pix_fmt, - const es_format_t *fmt, picture_sys_t *p_sys) - { -- if (pix_fmt != AV_PIX_FMT_VAAPI_VLD || p_sys == NULL) -+ if (pix_fmt != AV_PIX_FMT_VAAPI || p_sys == NULL) - return VLC_EGENERIC; - - (void) fmt; -@@ -263,7 +263,7 @@ static void DeleteDRM(vlc_va_t *va, void **hwctx) - static int CreateDRM(vlc_va_t *va, AVCodecContext *ctx, enum PixelFormat pix_fmt, - const es_format_t *fmt, picture_sys_t *p_sys) - { -- if (pix_fmt != AV_PIX_FMT_VAAPI_VLD || p_sys) -+ if (pix_fmt != AV_PIX_FMT_VAAPI || p_sys) - return VLC_EGENERIC; - - (void) fmt; -diff --git a/modules/codec/avcodec/video.c b/modules/codec/avcodec/video.c -index adb529354d1..2438b440f1e 100644 ---- a/modules/codec/avcodec/video.c -+++ b/modules/codec/avcodec/video.c -@@ -1620,7 +1620,7 @@ no_reuse: - #endif - AV_PIX_FMT_DXVA2_VLD, - #endif -- AV_PIX_FMT_VAAPI_VLD, -+ AV_PIX_FMT_VAAPI, - #if (LIBAVUTIL_VERSION_INT >= AV_VERSION_INT(52, 4, 0)) - AV_PIX_FMT_VDPAU, - #endif --- -GitLab - - -From 6feb18dadcb6176ae5cc2b4ae57f27f65fa93fdb Mon Sep 17 00:00:00 2001 -From: Ilkka Ollakka <ileoo@videolan.org> -Date: Fri, 18 Jun 2021 10:08:44 +0300 -Subject: [PATCH 7/9] avcodec: move picture type to use sidedata on encoding - -Sidedata AV_PKT_DATA_QUALITY_STATS has been present since 2015 on -version 56.51.100. Also previous coded_frame->pict_type doesn't seem to -be present anymore in ffmpeg master. - -(cherry picked from commit 8ed4f2a7a2dbc9522c3feebb39b2e4ccc7bf5d24) - -Refs ffmpeg/11bc79089378a5ec00547d0f85bc152afdf30dfa ---- - modules/codec/avcodec/encoder.c | 44 +++++++++++++++++---------------- - 1 file changed, 23 insertions(+), 21 deletions(-) - -diff --git a/modules/codec/avcodec/encoder.c b/modules/codec/avcodec/encoder.c -index 74e6fe18224..6138c641c0c 100644 ---- a/modules/codec/avcodec/encoder.c -+++ b/modules/codec/avcodec/encoder.c -@@ -1108,6 +1108,29 @@ static block_t *vlc_av_packet_Wrap(AVPacket *packet, mtime_t i_length, AVCodecCo - p_block->i_pts = p_block->i_pts * CLOCK_FREQ * context->time_base.num / context->time_base.den; - p_block->i_dts = p_block->i_dts * CLOCK_FREQ * context->time_base.num / context->time_base.den; - -+ uint8_t *av_packet_sidedata = av_packet_get_side_data(packet, AV_PKT_DATA_QUALITY_STATS, NULL); -+ if( av_packet_sidedata ) -+ { -+ switch ( av_packet_sidedata[4] ) -+ { -+ case AV_PICTURE_TYPE_I: -+ case AV_PICTURE_TYPE_SI: -+ p_block->i_flags |= BLOCK_FLAG_TYPE_I; -+ break; -+ case AV_PICTURE_TYPE_P: -+ case AV_PICTURE_TYPE_SP: -+ p_block->i_flags |= BLOCK_FLAG_TYPE_P; -+ break; -+ case AV_PICTURE_TYPE_B: -+ case AV_PICTURE_TYPE_BI: -+ p_block->i_flags |= BLOCK_FLAG_TYPE_B; -+ break; -+ default: -+ p_block->i_flags |= BLOCK_FLAG_TYPE_PB; -+ } -+ -+ } -+ - return p_block; - } - -@@ -1241,27 +1264,6 @@ static block_t *EncodeVideo( encoder_t *p_enc, picture_t *p_pict ) - - block_t *p_block = encode_avframe( p_enc, p_sys, frame ); - -- if( p_block ) -- { -- switch ( p_sys->p_context->coded_frame->pict_type ) -- { -- case AV_PICTURE_TYPE_I: -- case AV_PICTURE_TYPE_SI: -- p_block->i_flags |= BLOCK_FLAG_TYPE_I; -- break; -- case AV_PICTURE_TYPE_P: -- case AV_PICTURE_TYPE_SP: -- p_block->i_flags |= BLOCK_FLAG_TYPE_P; -- break; -- case AV_PICTURE_TYPE_B: -- case AV_PICTURE_TYPE_BI: -- p_block->i_flags |= BLOCK_FLAG_TYPE_B; -- break; -- default: -- p_block->i_flags |= BLOCK_FLAG_TYPE_PB; -- } -- } -- - return p_block; - } - --- -GitLab - - -From 00bd7590f33357047b555d85d6e935feed033333 Mon Sep 17 00:00:00 2001 -From: Mehdi Sabwat <mehdisabwat@gmail.com> -Date: Thu, 9 Apr 2020 21:59:56 +0200 -Subject: [PATCH 8/9] avformat: add support for url field in AvFormatContext - -Since Jan 21, 2018 filename field was deprecated in favor -of `url` which now has no length restrictions. - -From doc/APIChanges: -``` -2018-01-28 - ea3672b7d6 - lavf 58.7.100 - avformat.h - Deprecate AVFormatContext filename field which had limited length, use the - new dynamically allocated url field instead. -``` - -The URL field is freed by libavformat in avformat_free_context() in -avformat_CloseMux(). - -Signed-off-by: Alexandre Janniaux <ajanni@videolabs.io> -(cherry picked from commit a2ce2e3a8436845378af3b1828f2bb0fa0f4a268) - -Refs ffmpeg/30f7021aa0be2c978aefb73894b643c9bafbf51c ---- - modules/demux/avformat/mux.c | 8 ++++++++ - 1 file changed, 8 insertions(+) - -diff --git a/modules/demux/avformat/mux.c b/modules/demux/avformat/mux.c -index e6260e36885..adaf3404301 100644 ---- a/modules/demux/avformat/mux.c -+++ b/modules/demux/avformat/mux.c -@@ -95,9 +95,12 @@ int avformat_OpenMux( vlc_object_t *p_this ) - sout_mux_t *p_mux = (sout_mux_t*)p_this; - bool dummy = !strcmp( p_mux->p_access->psz_access, "dummy"); - -+#if ( (LIBAVFORMAT_VERSION_MICRO >= 100) \ -+ && (LIBAVFORMAT_VERSION_INT < AV_VERSION_INT(58, 7, 100)) ) - if( dummy && strlen(p_mux->p_access->psz_path) - >= sizeof (((AVFormatContext *)NULL)->filename) ) - return VLC_EGENERIC; -+#endif - - msg_Dbg( p_mux, "using %s %s", AVPROVIDER(LIBAVFORMAT), LIBAVFORMAT_IDENT ); - -@@ -132,7 +135,12 @@ int avformat_OpenMux( vlc_object_t *p_this ) - p_sys->oc->oformat = file_oformat; - /* If we use dummy access, let avformat write output */ - if( dummy ) -+#if ( (LIBAVFORMAT_VERSION_MICRO >= 100) \ -+ && (LIBAVFORMAT_VERSION_INT >= AV_VERSION_INT(58, 7, 100)) ) -+ p_sys->oc->url = av_strdup(p_mux->p_access->psz_path); -+#else - strcpy( p_sys->oc->filename, p_mux->p_access->psz_path ); -+#endif - - /* Create I/O wrapper */ - p_sys->io_buffer_size = 10 * 1024 * 1024; /* FIXME */ --- -GitLab - - -From 97867416201533742be3effa2abfe3c02fafd95c Mon Sep 17 00:00:00 2001 -From: Ilkka Ollakka <ileoo@videolan.org> -Date: Fri, 18 Jun 2021 10:31:00 +0300 -Subject: [PATCH 9/9] avformat: remove pts hack on recent libavformat - -The field AVStream.cur_dts has been removed in libavformat 59.2.103. - -Refs vlc4/c2ba623f0ad425e7743fca0bdc251d5bc9289e77 -Refs ffmpeg/591b88e6787c4e678237f02a50421d101abd25c2 ---- - modules/demux/avformat/mux.c | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/modules/demux/avformat/mux.c b/modules/demux/avformat/mux.c -index adaf3404301..6069a8326e5 100644 ---- a/modules/demux/avformat/mux.c -+++ b/modules/demux/avformat/mux.c -@@ -384,9 +384,11 @@ static int MuxBlock( sout_mux_t *p_mux, sout_input_t *p_input ) - pkt->dts = p_data->i_dts * p_stream->time_base.den / - CLOCK_FREQ / p_stream->time_base.num; - -+#if LIBAVFORMAT_VERSION_MICRO >= 100 && LIBAVFORMAT_VERSION_INT < AV_VERSION_INT(59, 2, 103) - /* this is another hack to prevent libavformat from triggering the "non monotone timestamps" check in avformat/utils.c */ - p_stream->cur_dts = ( p_data->i_dts * p_stream->time_base.den / - CLOCK_FREQ / p_stream->time_base.num ) - 1; -+#endif - - if( av_write_frame( p_sys->oc, pkt ) < 0 ) - { --- -GitLab - diff --git a/fix-av_register_all-patch.patch b/fix-av_register_all-patch.patch deleted file mode 100644 index cf4f12a4d1b3..000000000000 --- a/fix-av_register_all-patch.patch +++ /dev/null @@ -1,43 +0,0 @@ -From a77f45d0c3e5c3814062566f8fd210a8fe7fb46b Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?R=C3=A9mi=20Denis-Courmont?= <remi@remlab.net> -Date: Tue, 14 Apr 2020 19:25:07 +0300 -Subject: [PATCH] avcodec: fix flawed logic -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Cannot find any codec. - -Regression from 21d5a1933275edb7f67d05ea62a762464e07c2cb. - -(cherry picked from commit 067dcd0a1974b00a92e900b0e5c976349ad13859) -Signed-off-by: Hugo Beauzée-Luyssen <hugo@beauzee.fr> ---- - modules/codec/avcodec/avcommon.h | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/modules/codec/avcodec/avcommon.h b/modules/codec/avcodec/avcommon.h -index 158c01e3201..ff5dba06c92 100644 ---- a/modules/codec/avcodec/avcommon.h -+++ b/modules/codec/avcodec/avcommon.h -@@ -106,7 +106,7 @@ static inline void vlc_init_avformat(vlc_object_t *obj) - - avformat_network_init(); - --#if (LIBAVFORMAT_VERSION_MICRO >= 100) && (LIBAVFORMAT_VERSION_INT < AV_VERSION_INT(58, 9, 100)) -+#if (LIBAVFORMAT_VERSION_MICRO < 100) || (LIBAVFORMAT_VERSION_INT < AV_VERSION_INT(58, 9, 100)) - av_register_all(); - #endif - -@@ -123,7 +123,7 @@ static inline void vlc_init_avcodec(vlc_object_t *obj) - - vlc_init_avutil(obj); - --#if (LIBAVFORMAT_VERSION_MICRO >= 100) && (LIBAVCODEC_VERSION_INT < AV_VERSION_INT(58, 10, 100)) -+#if (LIBAVFORMAT_VERSION_MICRO < 100) || (LIBAVCODEC_VERSION_INT < AV_VERSION_INT(58, 10, 100)) - avcodec_register_all(); - #endif - --- -GitLab - diff --git a/pkt_timebase.patch b/pkt_timebase.patch deleted file mode 100644 index 12af13b0dda5..000000000000 --- a/pkt_timebase.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 2da109684a662a51989aa581bfc6cd1888f6c68c Mon Sep 17 00:00:00 2001 -From: Ilkka Ollakka <ileoo@videolan.org> -Date: Fri, 18 Jun 2021 10:23:35 +0300 -Subject: [PATCH] avcodec/subtitle: stop using removed setter for pkt timebase -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Removed from ffmpeg repo in commit 23bb78d2ea4f0e3a0835744d59708efed50abccc. - -(cherry picked from commit e7190e7a70e9701754c50348f5b6357759440657) -Signed-off-by: Hugo Beauzée-Luyssen <hugo@beauzee.fr> ---- - modules/codec/avcodec/subtitle.c | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -diff --git a/modules/codec/avcodec/subtitle.c b/modules/codec/avcodec/subtitle.c -index a17ba985e15..d3afe4270be 100644 ---- a/modules/codec/avcodec/subtitle.c -+++ b/modules/codec/avcodec/subtitle.c -@@ -90,7 +90,9 @@ int InitSubtitleDec(vlc_object_t *obj) - context->extradata_size = 0; - context->extradata = NULL; - --#if LIBAVFORMAT_VERSION_MICRO >= 100 -+#if LIBAVFORMAT_VERSION_MAJOR >= 59 -+ context->pkt_timebase=AV_TIME_BASE_Q; -+#elif LIBAVFORMAT_VERSION_MICRO >= 100 - av_codec_set_pkt_timebase(context, AV_TIME_BASE_Q); - #endif - --- -GitLab - diff --git a/vlc-3.0.11.1-srt_1.4.2.patch b/vlc-3.0.11.1-srt_1.4.2.patch deleted file mode 100644 index 00758c4e14bc..000000000000 --- a/vlc-3.0.11.1-srt_1.4.2.patch +++ /dev/null @@ -1,36 +0,0 @@ -diff -ru vlc-3.0.13.orig/configure.ac vlc-3.0.13/configure.ac ---- vlc-3.0.13.orig/configure.ac 2021-04-27 15:18:39.000000000 +0200 -+++ vlc-3.0.13/configure.ac 2021-05-03 16:10:00.342592591 +0200 -@@ -4016,7 +4016,7 @@ - dnl - dnl SRT plugin - dnl --PKG_ENABLE_MODULES_VLC([SRT], [access_srt access_output_srt], [srt >= 1.2.2 srt < 1.3.0], [SRT input/output plugin], [auto], [], [], [-DENABLE_SRT]) -+PKG_ENABLE_MODULES_VLC([SRT], [access_srt access_output_srt], [srt >= 1.2.2], [SRT input/output plugin], [auto], [], [], [-DENABLE_SRT]) - - EXTEND_HELP_STRING([Visualisations and Video filter plugins:]) - dnl -diff -ruN a/modules/access/srt.c b/modules/access/srt.c ---- a/modules/access/srt.c 2018-04-23 10:03:39.000000000 +0200 -+++ b/modules/access/srt.c 2020-09-26 10:35:18.830149487 +0200 -@@ -165,7 +165,7 @@ - - /* Set latency */ - i_latency = var_InheritInteger( p_stream, "latency" ); -- srt_setsockopt( p_sys->sock, 0, SRTO_TSBPDDELAY, -+ srt_setsockopt( p_sys->sock, 0, SRTO_LATENCY, - &i_latency, sizeof( int ) ); - - psz_passphrase = var_InheritString( p_stream, "passphrase" ); -diff -ruN a/modules/access_output/srt.c b/modules/access_output/srt.c ---- a/modules/access_output/srt.c 2018-04-06 11:22:51.000000000 +0200 -+++ b/modules/access_output/srt.c 2020-09-26 10:35:03.386828120 +0200 -@@ -162,7 +162,7 @@ - - /* Set latency */ - i_latency = var_InheritInteger( p_access, "latency" ); -- srt_setsockopt( p_sys->sock, 0, SRTO_TSBPDDELAY, -+ srt_setsockopt( p_sys->sock, 0, SRTO_LATENCY, - &i_latency, sizeof( int ) ); - - if ( psz_passphrase != NULL && psz_passphrase[0] != '\0') |