sysutils/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2026-10-24 02:09:03 +03:00
Code Activity

avformat: remove the asf_o demuxer

Browse Source 
asf_o is a second, non-default implementation of the ASF demuxer next
to asfdec_f.c. Security issues keep being reported against it, so it
is a maintenance burden without a benefit over the default demuxer.

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
This commit is contained in:
Michael Niedermayer
2026-10-10 18:50:07 +02:00
committed by michaelni
parent 71403a21b0
commit d20d75cb9b
8 changed files with 2 additions and 1708 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Changelog
View File

@@ -20,6 +20,7 @@ version <next>:
- xHE-AAC encoding via libfdk-xhe-aac
- jpegapp bitstream filter
- Infinity IMM6 video decoder
- Remove the asf_o demuxer
version 9.0:

1
configure vendored
View File

@@ -3899,7 +3899,6 @@ aiff_muxer_select="iso_media"
amv_muxer_select="riffenc"
apv_demuxer_select="apv_parser"
asf_demuxer_select="riffdec"
asf_o_demuxer_select="riffdec"
asf_muxer_select="riffenc"
asf_stream_muxer_select="asf_muxer"
av1_demuxer_select="av1_frame_merge_bsf av1_parser"

2
libavformat/Makefile
View File

@@ -140,8 +140,6 @@ OBJS-$(CONFIG_ARGO_CVG_DEMUXER) += argo_cvg.o
OBJS-$(CONFIG_ARGO_CVG_MUXER) += argo_cvg.o
OBJS-$(CONFIG_ASF_DEMUXER) += asfdec_f.o asf.o asfcrypt.o \
asf_tags.o
OBJS-$(CONFIG_ASF_O_DEMUXER) += asfdec_o.o asf.o asfcrypt.o \
asf_tags.o
OBJS-$(CONFIG_ASF_MUXER) += asfenc.o asf.o asf_tags.o
OBJS-$(CONFIG_ASS_DEMUXER) += assdec.o subtitles.o
OBJS-$(CONFIG_ASS_MUXER) += assenc.o

1
libavformat/allformats.c
View File

@@ -82,7 +82,6 @@ extern const FFInputFormat ff_argo_cvg_demuxer;
extern const FFOutputFormat ff_argo_cvg_muxer;
extern const FFInputFormat ff_asf_demuxer;
extern const FFOutputFormat ff_asf_muxer;
extern const FFInputFormat ff_asf_o_demuxer;
extern const FFInputFormat ff_ass_demuxer;
extern const FFOutputFormat ff_ass_muxer;
extern const FFInputFormat ff_ast_demuxer;

1670
libavformat/asfdec_o.c
View File

File diff suppressed because it is too large Load Diff

2
libavformat/version.h
View File

@@ -32,7 +32,7 @@
#include "version_major.h"
#define LIBAVFORMAT_VERSION_MINOR 11
#define LIBAVFORMAT_VERSION_MICRO 100
#define LIBAVFORMAT_VERSION_MICRO 101
#define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \
LIBAVFORMAT_VERSION_MINOR, \

3
tests/fate/id3v2.mak
View File

@@ -82,9 +82,6 @@ fate-id3v2-utf16-bom: CMD = transcode wav $(TARGET_SAMPLES)/audio-reference/yo.r
FATE_ID3V2_FFPROBE-$(CONFIG_ASF_DEMUXER) += fate-id3v2-wma-comm
fate-id3v2-wma-comm: CMD = probetags $(TARGET_SAMPLES)/cover_art/wma_with_ID3_APIC_trimmed.wma
FATE_ID3V2_FFPROBE-$(CONFIG_ASF_O_DEMUXER) += fate-id3v2-wma-comm-asf_o
fate-id3v2-wma-comm-asf_o: CMD = probetags -f asf_o $(TARGET_SAMPLES)/cover_art/wma_with_ID3_APIC_trimmed.wma
# Same file with the deprecated descriptor-as-key export enabled.
FATE_ID3V2_FFPROBE-$(CONFIG_ASF_DEMUXER) += fate-id3v2-wma-comm-legacy-keys
fate-id3v2-wma-comm-legacy-keys: CMD = probetags -fflags +legacy_id3v2_comm_keys $(TARGET_SAMPLES)/cover_art/wma_with_ID3_APIC_trimmed.wma

30
tests/ref/fate/id3v2-wma-comm-asf_o
View File

@@ -1,30 +0,0 @@
[FORMAT]
TAG:Title=Piste 5
TAG:Author=Higelin
TAG:WM/Track=4
TAG:WM/Lyrics=
TAG:WMFSDKVersion=8.00.00.4477
TAG:WMFSDKNeeded=0.0.0.0000
TAG:WM/GenreID=Inconnu
TAG:track=00
TAG:artist=Higelin
TAG:album=Tombé du Ciel
TAG:genre=Inconnu
TAG:comment-eng=
TAG:lyrics-eng=
TAG:comment-MusicMatch_Bio-eng=
TAG:TLEN=286000
TAG:comment-MusicMatch_Tempo-eng=
TAG:comment-MusicMatch_Mood-eng=
TAG:comment-MusicMatch_Preference-eng=
TAG:comment-MusicMatch_Situation-eng=
TAG:WM/TrackNumber=5
TAG:WM/Composer=Jacques Higelin
TAG:WM/Genre=Inconnu
TAG:WM/AlbumTitle=Tombé du Ciel
TAG:WM/MCDI=B
TAG:WM/EncodingTime=127518048290000000
TAG:WM/AlbumArtist=Jacques Higelin
TAG:WM/Provider=User Feedback
TAG:creation_time=2003-03-23T11:52:22.967000Z
[/FORMAT]