[vlc-devel] [PATCH 12/15] input: Rename input_attachment_t to input_item_attachment_t
Hugo Beauzée-Luyssen
hugo at beauzee.fr
Tue Nov 10 18:40:22 CET 2020
---
include/vlc_codec.h | 4 ++--
include/vlc_common.h | 2 +-
include/vlc_demux.h | 4 ++--
include/vlc_filter.h | 4 ++--
include/vlc_input.h | 8 ++++----
include/vlc_input_item.h | 6 +++---
modules/access/bluray.c | 10 +++++-----
modules/codec/libass.c | 4 ++--
modules/codec/subsusf.c | 4 ++--
modules/demux/avformat/demux.c | 10 +++++-----
modules/demux/avi/avi.c | 6 +++---
modules/demux/flac.c | 10 +++++-----
modules/demux/mkv/demux.hpp | 4 ++--
modules/demux/mkv/mkv.cpp | 8 ++++----
modules/demux/mp4/attachments.c | 12 +++++------
modules/demux/mp4/attachments.h | 2 +-
modules/demux/mp4/mp4.c | 4 ++--
modules/demux/mpeg/ts.c | 8 ++++----
modules/demux/mpeg/ts_si.c | 2 +-
modules/demux/ogg.c | 6 +++---
modules/demux/ogg.h | 2 +-
modules/demux/xiph_metadata.c | 10 +++++-----
modules/demux/xiph_metadata.h | 4 ++--
modules/meta_engine/taglib.cpp | 20 +++++++++----------
modules/text_renderer/freetype/freetype.c | 4 ++--
modules/text_renderer/freetype/freetype.h | 2 +-
.../text_renderer/freetype/platform_fonts.c | 2 +-
src/input/access.c | 2 +-
src/input/attachment.c | 20 +++++++++----------
src/input/decoder.c | 2 +-
src/input/decoder.h | 2 +-
src/input/es_out.c | 2 +-
src/input/input.c | 16 +++++++--------
src/input/item.c | 8 ++++----
src/input/meta.c | 2 +-
src/input/stream.h | 2 +-
src/input/stream_memory.c | 4 ++--
src/video_output/vout_subpictures.c | 2 +-
test/src/input/demux-run.c | 2 +-
39 files changed, 113 insertions(+), 113 deletions(-)
diff --git a/include/vlc_codec.h b/include/vlc_codec.h
index 7ab479ae32..e7777bb79d 100644
--- a/include/vlc_codec.h
+++ b/include/vlc_codec.h
@@ -88,7 +88,7 @@ struct decoder_owner_callbacks
/* Input attachments
* cf. decoder_GetInputAttachments */
int (*get_attachments)( decoder_t *p_dec,
- input_attachment_t ***ppp_attachment,
+ input_item_attachment_t ***ppp_attachment,
int *pi_attachment );
};
@@ -489,7 +489,7 @@ static inline subpicture_t *decoder_NewSubpicture( decoder_t *dec,
* You MUST release the returned values
*/
static inline int decoder_GetInputAttachments( decoder_t *dec,
- input_attachment_t ***ppp_attachment,
+ input_item_attachment_t ***ppp_attachment,
int *pi_attachment )
{
vlc_assert( dec->cbs != NULL );
diff --git a/include/vlc_common.h b/include/vlc_common.h
index 22a6c089d7..1407252342 100644
--- a/include/vlc_common.h
+++ b/include/vlc_common.h
@@ -364,7 +364,7 @@ typedef struct es_out_id_t es_out_id_t;
typedef struct seekpoint_t seekpoint_t;
typedef struct info_t info_t;
typedef struct info_category_t info_category_t;
-typedef struct input_attachment_t input_attachment_t;
+typedef struct input_item_attachment_t input_item_attachment_t;
/* Format */
typedef struct audio_format_t audio_format_t;
diff --git a/include/vlc_demux.h b/include/vlc_demux.h
index 6d6befa01b..269f7a3591 100644
--- a/include/vlc_demux.h
+++ b/include/vlc_demux.h
@@ -62,7 +62,7 @@ typedef struct demux_meta_t
vlc_meta_t *p_meta; /**< meta data */
int i_attachments; /**< number of attachments */
- input_attachment_t **attachments; /**< array of attachments */
+ input_item_attachment_t **attachments; /**< array of attachments */
} demux_meta_t;
/**
@@ -226,7 +226,7 @@ enum demux_query_e
/*
* Fetches attachment from the demux.
* The returned attachments are owned by the demuxer and must not be modified
- * arg1=input_attachment_t***, int* res=can fail
+ * arg1=input_item_attachment_t***, int* res=can fail
*/
DEMUX_GET_ATTACHMENTS,
diff --git a/include/vlc_filter.h b/include/vlc_filter.h
index 9d5e3541a4..12a0612e27 100644
--- a/include/vlc_filter.h
+++ b/include/vlc_filter.h
@@ -72,7 +72,7 @@ typedef struct filter_owner_t
/* Input attachments
* XXX use filter_GetInputAttachments */
- int (*pf_get_attachments)( filter_t *, input_attachment_t ***, int * );
+ int (*pf_get_attachments)( filter_t *, input_item_attachment_t ***, int * );
void *sys;
} filter_owner_t;
@@ -354,7 +354,7 @@ static inline subpicture_t *filter_NewSubpicture( filter_t *p_filter )
* You MUST release the returned values
*/
static inline int filter_GetInputAttachments( filter_t *p_filter,
- input_attachment_t ***ppp_attachment,
+ input_item_attachment_t ***ppp_attachment,
int *pi_attachment )
{
if( !p_filter->owner.pf_get_attachments )
diff --git a/include/vlc_input.h b/include/vlc_input.h
index b0bb237b89..0125861886 100644
--- a/include/vlc_input.h
+++ b/include/vlc_input.h
@@ -155,7 +155,7 @@ static inline input_title_t *vlc_input_title_Duplicate( const input_title_t *t )
/*****************************************************************************
* Attachments
*****************************************************************************/
-struct input_attachment_t
+struct input_item_attachment_t
{
char *psz_name;
char *psz_mime;
@@ -165,15 +165,15 @@ struct input_attachment_t
void *p_data;
};
-VLC_API void vlc_input_attachment_Release( input_attachment_t *a );
+VLC_API void vlc_input_attachment_Release( input_item_attachment_t *a );
-VLC_API input_attachment_t *vlc_input_attachment_New( const char *psz_name,
+VLC_API input_item_attachment_t *vlc_input_attachment_New( const char *psz_name,
const char *psz_mime,
const char *psz_description,
const void *p_data,
size_t i_data );
-VLC_API input_attachment_t *vlc_input_attachment_Hold( input_attachment_t *a );
+VLC_API input_item_attachment_t *vlc_input_attachment_Hold( input_item_attachment_t *a );
/**
* Input rate.
diff --git a/include/vlc_input_item.h b/include/vlc_input_item.h
index b48d9a1755..f38e7ba7ca 100644
--- a/include/vlc_input_item.h
+++ b/include/vlc_input_item.h
@@ -125,7 +125,7 @@ struct input_item_t
before events are registered. */
/* Input attachment */
int i_attachment;
- input_attachment_t **attachment;
+ input_item_attachment_t **attachment;
};
#define INPUT_ITEM_URI_NOP "vlc://nop" /* dummy URI for node/directory items */
@@ -338,8 +338,8 @@ VLC_API int input_item_DelInfo( input_item_t *p_i, const char *psz_cat, const ch
VLC_API void input_item_ReplaceInfos( input_item_t *, info_category_t * );
VLC_API void input_item_MergeInfos( input_item_t *, info_category_t * );
-int input_item_GetAttachments(input_item_t *item, input_attachment_t ***attachments);
-input_attachment_t *input_item_GetAttachment(input_item_t *item, const char *name);
+int input_item_GetAttachments(input_item_t *item, input_item_attachment_t ***attachments);
+input_item_attachment_t *input_item_GetAttachment(input_item_t *item, const char *name);
/**
* This function creates a new input_item_t with the provided information.
diff --git a/modules/access/bluray.c b/modules/access/bluray.c
index d6278d1331..17cc4a952e 100644
--- a/modules/access/bluray.c
+++ b/modules/access/bluray.c
@@ -328,7 +328,7 @@ typedef struct
/* Attachments */
int i_attachments;
- input_attachment_t **attachments;
+ input_item_attachment_t **attachments;
int i_cover_idx;
/* Meta information */
@@ -668,7 +668,7 @@ static void attachThumbnail(demux_t *p_demux)
void *data;
if (bd_get_meta_file(p_sys->bluray, p_sys->p_meta->thumbnails[0].path, &data, &size) > 0) {
char psz_name[64];
- input_attachment_t *p_attachment;
+ input_item_attachment_t *p_attachment;
snprintf(psz_name, sizeof(psz_name), "picture%d_%s", p_sys->i_attachments, p_sys->p_meta->thumbnails[0].path);
@@ -2616,15 +2616,15 @@ static int blurayControl(demux_t *p_demux, int query, va_list args)
case DEMUX_GET_ATTACHMENTS:
{
- input_attachment_t ***ppp_attach =
- va_arg(args, input_attachment_t ***);
+ input_item_attachment_t ***ppp_attach =
+ va_arg(args, input_item_attachment_t ***);
int *pi_int = va_arg(args, int *);
if (p_sys->i_attachments <= 0)
return VLC_EGENERIC;
*pi_int = 0;
- *ppp_attach = vlc_alloc(p_sys->i_attachments, sizeof(input_attachment_t *));
+ *ppp_attach = vlc_alloc(p_sys->i_attachments, sizeof(input_item_attachment_t *));
if(!*ppp_attach)
return VLC_EGENERIC;
for (int i = 0; i < p_sys->i_attachments; i++)
diff --git a/modules/codec/libass.c b/modules/codec/libass.c
index 9d3ce5c1d2..9ed211a370 100644
--- a/modules/codec/libass.c
+++ b/modules/codec/libass.c
@@ -161,7 +161,7 @@ static int Create( vlc_object_t *p_this )
}
/* load attachments */
- input_attachment_t **pp_attachments;
+ input_item_attachment_t **pp_attachments;
int i_attachments;
if( decoder_GetInputAttachments( p_dec, &pp_attachments, &i_attachments ))
{
@@ -170,7 +170,7 @@ static int Create( vlc_object_t *p_this )
}
for( int k = 0; k < i_attachments; k++ )
{
- input_attachment_t *p_attach = pp_attachments[k];
+ input_item_attachment_t *p_attach = pp_attachments[k];
bool found = false;
diff --git a/modules/codec/subsusf.c b/modules/codec/subsusf.c
index 04ea674a35..d8deba1307 100644
--- a/modules/codec/subsusf.c
+++ b/modules/codec/subsusf.c
@@ -480,7 +480,7 @@ static subpicture_region_t *CreateTextRegion( decoder_t *p_dec,
static int ParseImageAttachments( decoder_t *p_dec )
{
decoder_sys_t *p_sys = p_dec->p_sys;
- input_attachment_t **pp_attachments;
+ input_item_attachment_t **pp_attachments;
int i_attachments_cnt;
if( VLC_SUCCESS != decoder_GetInputAttachments( p_dec, &pp_attachments, &i_attachments_cnt ))
@@ -488,7 +488,7 @@ static int ParseImageAttachments( decoder_t *p_dec )
for( int k = 0; k < i_attachments_cnt; k++ )
{
- input_attachment_t *p_attach = pp_attachments[k];
+ input_item_attachment_t *p_attach = pp_attachments[k];
vlc_fourcc_t type = image_Mime2Fourcc( p_attach->psz_mime );
diff --git a/modules/demux/avformat/demux.c b/modules/demux/avformat/demux.c
index 91c4e005f4..e2151b0143 100644
--- a/modules/demux/avformat/demux.c
+++ b/modules/demux/avformat/demux.c
@@ -73,7 +73,7 @@ typedef struct
unsigned i_ssa_order;
int i_attachments;
- input_attachment_t **attachments;
+ input_item_attachment_t **attachments;
/* Only one title with seekpoints possible atm. */
input_title_t *p_title;
@@ -582,7 +582,7 @@ int avformat_OpenDemux( vlc_object_t *p_this )
#ifdef HAVE_AVUTIL_CODEC_ATTACHMENT
if( cp->codec_type == AVMEDIA_TYPE_ATTACHMENT )
{
- input_attachment_t *p_attachment;
+ input_item_attachment_t *p_attachment;
psz_type = "attachment";
if( cp->codec_id == AV_CODEC_ID_TTF )
@@ -1171,15 +1171,15 @@ static int Control( demux_t *p_demux, int i_query, va_list args )
case DEMUX_GET_ATTACHMENTS:
{
- input_attachment_t ***ppp_attach =
- va_arg( args, input_attachment_t*** );
+ input_item_attachment_t ***ppp_attach =
+ va_arg( args, input_item_attachment_t*** );
int *pi_int = va_arg( args, int * );
int i;
if( p_sys->i_attachments <= 0 )
return VLC_EGENERIC;
- *ppp_attach = vlc_alloc( p_sys->i_attachments, sizeof(input_attachment_t*) );
+ *ppp_attach = vlc_alloc( p_sys->i_attachments, sizeof(input_item_attachment_t*) );
if( *ppp_attach == NULL )
return VLC_EGENERIC;
diff --git a/modules/demux/avi/avi.c b/modules/demux/avi/avi.c
index 6159e5e4e8..e10c0a8657 100644
--- a/modules/demux/avi/avi.c
+++ b/modules/demux/avi/avi.c
@@ -194,7 +194,7 @@ typedef struct
vlc_meta_t *meta;
unsigned int i_attachment;
- input_attachment_t **attachment;
+ input_item_attachment_t **attachment;
} demux_sys_t;
#define __EVEN(x) (((x) & 1) ? (x) + 1 : (x))
@@ -1695,7 +1695,7 @@ static int Control( demux_t *p_demux, int i_query, va_list args )
if( p_sys->i_attachment <= 0 )
return VLC_EGENERIC;
- input_attachment_t ***ppp_attach = va_arg( args, input_attachment_t*** );
+ input_item_attachment_t ***ppp_attach = va_arg( args, input_item_attachment_t*** );
int *pi_int = va_arg( args, int * );
*ppp_attach = calloc( p_sys->i_attachment, sizeof(**ppp_attach) );
@@ -2840,7 +2840,7 @@ static void AVI_ExtractSubtitle( demux_t *p_demux,
{
demux_sys_t *p_sys = p_demux->p_sys;
block_t *p_block = NULL;
- input_attachment_t *p_attachment = NULL;
+ input_item_attachment_t *p_attachment = NULL;
char *psz_description = NULL;
avi_chunk_indx_t *p_indx = NULL;
diff --git a/modules/demux/flac.c b/modules/demux/flac.c
index 52850562f5..781a03ed41 100644
--- a/modules/demux/flac.c
+++ b/modules/demux/flac.c
@@ -100,7 +100,7 @@ typedef struct
/* */
int i_attachments;
- input_attachment_t **attachments;
+ input_item_attachment_t **attachments;
int i_cover_idx;
int i_cover_score;
} demux_sys_t;
@@ -573,14 +573,14 @@ static int Control( demux_t *p_demux, int i_query, va_list args )
}
else if( i_query == DEMUX_GET_ATTACHMENTS )
{
- input_attachment_t ***ppp_attach =
- va_arg( args, input_attachment_t *** );
+ input_item_attachment_t ***ppp_attach =
+ va_arg( args, input_item_attachment_t *** );
int *pi_int = va_arg( args, int * );
if( p_sys->i_attachments <= 0 )
return VLC_EGENERIC;
- *ppp_attach = vlc_alloc( p_sys->i_attachments, sizeof(input_attachment_t*) );
+ *ppp_attach = vlc_alloc( p_sys->i_attachments, sizeof(input_item_attachment_t*) );
if( !*ppp_attach )
return VLC_EGENERIC;
*pi_int = p_sys->i_attachments;
@@ -829,7 +829,7 @@ static void ParsePicture( demux_t *p_demux, const uint8_t *p_data, size_t i_data
i_data -= 4; p_data += 4;
- input_attachment_t *p_attachment = ParseFlacPicture( p_data, i_data,
+ input_item_attachment_t *p_attachment = ParseFlacPicture( p_data, i_data,
p_sys->i_attachments, &p_sys->i_cover_score, &p_sys->i_cover_idx );
if( p_attachment == NULL )
return;
diff --git a/modules/demux/mkv/demux.hpp b/modules/demux/mkv/demux.hpp
index b7eb92e55c..50cd9ee31a 100644
--- a/modules/demux/mkv/demux.hpp
+++ b/modules/demux/mkv/demux.hpp
@@ -82,8 +82,8 @@ public:
unsigned i_updates;
std::vector<matroska_stream_c*> streams;
- std::vector<std::unique_ptr<input_attachment_t,
- void(*)(input_attachment_t*)>> stored_attachments;
+ std::vector<std::unique_ptr<input_item_attachment_t,
+ void(*)(input_item_attachment_t*)>> stored_attachments;
std::vector<matroska_segment_c*> opened_segments;
std::vector<virtual_segment_c*> used_vsegments;
virtual_segment_c *p_current_vsegment;
diff --git a/modules/demux/mkv/mkv.cpp b/modules/demux/mkv/mkv.cpp
index 7a6b72a32e..bc3448d409 100644
--- a/modules/demux/mkv/mkv.cpp
+++ b/modules/demux/mkv/mkv.cpp
@@ -318,7 +318,7 @@ static int Control( demux_t *p_demux, int i_query, va_list args )
bool b;
vlc_meta_t *p_meta;
- input_attachment_t ***ppp_attach;
+ input_item_attachment_t ***ppp_attach;
int *pi_int;
switch( i_query )
@@ -327,15 +327,15 @@ static int Control( demux_t *p_demux, int i_query, va_list args )
return vlc_stream_vaControl( p_demux->s, i_query, args );
case DEMUX_GET_ATTACHMENTS:
- ppp_attach = va_arg( args, input_attachment_t*** );
+ ppp_attach = va_arg( args, input_item_attachment_t*** );
pi_int = va_arg( args, int * );
if( p_sys->stored_attachments.size() <= 0 )
return VLC_EGENERIC;
*pi_int = p_sys->stored_attachments.size();
- *ppp_attach = static_cast<input_attachment_t**>( vlc_alloc( p_sys->stored_attachments.size(),
- sizeof(input_attachment_t*) ) );
+ *ppp_attach = static_cast<input_item_attachment_t**>( vlc_alloc( p_sys->stored_attachments.size(),
+ sizeof(input_item_attachment_t*) ) );
if( !(*ppp_attach) )
return VLC_ENOMEM;
for( size_t i = 0; i < p_sys->stored_attachments.size(); i++ )
diff --git a/modules/demux/mp4/attachments.c b/modules/demux/mp4/attachments.c
index 2e00c0468e..2d091e6fb5 100644
--- a/modules/demux/mp4/attachments.c
+++ b/modules/demux/mp4/attachments.c
@@ -233,12 +233,12 @@ int MP4_GetCoverMetaURI( const MP4_Box_t *p_root,
return VLC_SUCCESS;
}
-size_t MP4_GetAttachments( const MP4_Box_t *p_root, input_attachment_t ***ppp_attach )
+size_t MP4_GetAttachments( const MP4_Box_t *p_root, input_item_attachment_t ***ppp_attach )
{
const MP4_Box_t *p_metaroot = NULL;
const char *psz_metarootpath;
size_t i_count = 0;
- input_attachment_t **pp_attach = NULL;
+ input_item_attachment_t **pp_attach = NULL;
*ppp_attach = NULL;
/* Count MAX number of total attachments */
@@ -264,7 +264,7 @@ size_t MP4_GetAttachments( const MP4_Box_t *p_root, input_attachment_t ***ppp_at
if ( i_count == 0 )
return 0;
- pp_attach = vlc_alloc( i_count, sizeof(input_attachment_t*) );
+ pp_attach = vlc_alloc( i_count, sizeof(input_item_attachment_t*) );
if( !(pp_attach) )
return 0;
@@ -289,7 +289,7 @@ size_t MP4_GetAttachments( const MP4_Box_t *p_root, input_attachment_t ***ppp_at
psz_metarootpath,
i_index - 1 ) > -1 )
{
- input_attachment_t *p_attach =
+ input_item_attachment_t *p_attach =
vlc_input_attachment_New(
psz_filename,
psz_mime,
@@ -322,7 +322,7 @@ size_t MP4_GetAttachments( const MP4_Box_t *p_root, input_attachment_t ***ppp_at
const MP4_Box_t *p_pict = MP4_BoxGet( p_root, rgz_path );
if( p_pict )
{
- input_attachment_t *p_attach =
+ input_item_attachment_t *p_attach =
vlc_input_attachment_New(
psz_location,
"image/x-pict",
@@ -353,7 +353,7 @@ size_t MP4_GetAttachments( const MP4_Box_t *p_root, input_attachment_t ***ppp_at
const char *psz_mime = getMimeType( type );
if ( asprintf( &psz_location, "thum[%u]", i_index - 1 ) > -1 )
{
- input_attachment_t *p_attach =
+ input_item_attachment_t *p_attach =
vlc_input_attachment_New(
psz_location,
psz_mime,
diff --git a/modules/demux/mp4/attachments.h b/modules/demux/mp4/attachments.h
index fe8eaf1b7f..0c5e8b0dc6 100644
--- a/modules/demux/mp4/attachments.h
+++ b/modules/demux/mp4/attachments.h
@@ -21,7 +21,7 @@
#ifndef VLC_MP4_ATTACHMENTS_H_
#define VLC_MP4_ATTACHMENTS_H_
-size_t MP4_GetAttachments( const MP4_Box_t *, input_attachment_t *** );
+size_t MP4_GetAttachments( const MP4_Box_t *, input_item_attachment_t *** );
const MP4_Box_t *MP4_GetMetaRoot( const MP4_Box_t *, const char ** );
int MP4_GetCoverMetaURI( const MP4_Box_t *, const MP4_Box_t *,
const char *, vlc_meta_t * );
diff --git a/modules/demux/mp4/mp4.c b/modules/demux/mp4/mp4.c
index fb3191af05..d7b6ee75d7 100644
--- a/modules/demux/mp4/mp4.c
+++ b/modules/demux/mp4/mp4.c
@@ -147,7 +147,7 @@ typedef struct
mp4_fragments_index_t *p_fragsindex;
ssize_t i_attachments;
- input_attachment_t **pp_attachments;
+ input_item_attachment_t **pp_attachments;
} demux_sys_t;
#define DEMUX_INCREMENT VLC_TICK_FROM_MS(250) /* How far the pcr will go, each round */
@@ -2045,7 +2045,7 @@ static int Control( demux_t *p_demux, int i_query, va_list args )
case DEMUX_GET_ATTACHMENTS:
{
- input_attachment_t ***ppp_attach = va_arg( args, input_attachment_t*** );
+ input_item_attachment_t ***ppp_attach = va_arg( args, input_item_attachment_t*** );
int *pi_int = va_arg( args, int * );
if( p_sys->i_attachments == -1 )
diff --git a/modules/demux/mpeg/ts.c b/modules/demux/mpeg/ts.c
index 520379ccb3..f1960e8a5c 100644
--- a/modules/demux/mpeg/ts.c
+++ b/modules/demux/mpeg/ts.c
@@ -550,7 +550,7 @@ static int Open( vlc_object_t *p_this )
static void FreeDictAttachment( void *p_value, void *p_obj )
{
VLC_UNUSED(p_obj);
- vlc_input_attachment_Release( (input_attachment_t *) p_value );
+ vlc_input_attachment_Release( (input_item_attachment_t *) p_value );
}
static void Close( vlc_object_t *p_this )
@@ -1178,14 +1178,14 @@ static int Control( demux_t *p_demux, int i_query, va_list args )
case DEMUX_GET_ATTACHMENTS:
{
- input_attachment_t ***ppp_attach = va_arg( args, input_attachment_t *** );
+ input_item_attachment_t ***ppp_attach = va_arg( args, input_item_attachment_t *** );
int *pi_int = va_arg( args, int * );
*pi_int = vlc_dictionary_keys_count( &p_sys->attachments );
if( *pi_int <= 0 )
return VLC_EGENERIC;
- *ppp_attach = vlc_alloc( *pi_int, sizeof(input_attachment_t*) );
+ *ppp_attach = vlc_alloc( *pi_int, sizeof(input_item_attachment_t*) );
if( !*ppp_attach )
return VLC_EGENERIC;
@@ -1197,7 +1197,7 @@ static int Control( demux_t *p_demux, int i_query, va_list args )
{
msg_Err(p_demux, "GET ATTACHMENT %s", p_entry->psz_key);
(*ppp_attach)[*pi_int] = vlc_input_attachment_Hold(
- (input_attachment_t *) p_entry->p_value );
+ (input_item_attachment_t *) p_entry->p_value );
if( (*ppp_attach)[*pi_int] )
(*pi_int)++;
}
diff --git a/modules/demux/mpeg/ts_si.c b/modules/demux/mpeg/ts_si.c
index 3aef96ce96..271a32ea80 100644
--- a/modules/demux/mpeg/ts_si.c
+++ b/modules/demux/mpeg/ts_si.c
@@ -742,7 +742,7 @@ static void ARIB_CDT_RawCallback( dvbpsi_t *p_handle, const dvbpsi_psi_section_t
if( !vlc_dictionary_has_key( &p_sys->attachments, psz_name ) &&
ts_arib_inject_png_palette( &p_dmb[7], i_size, &p_png, &i_png ) )
{
- input_attachment_t *p_att = vlc_input_attachment_New(
+ input_item_attachment_t *p_att = vlc_input_attachment_New(
psz_name, "image/png", NULL, p_png, i_png );
if( p_att )
{
diff --git a/modules/demux/ogg.c b/modules/demux/ogg.c
index b31bdc4aac..d28671ccb6 100644
--- a/modules/demux/ogg.c
+++ b/modules/demux/ogg.c
@@ -739,14 +739,14 @@ static int Control( demux_t *p_demux, int i_query, va_list args )
case DEMUX_GET_ATTACHMENTS:
{
- input_attachment_t ***ppp_attach =
- va_arg( args, input_attachment_t *** );
+ input_item_attachment_t ***ppp_attach =
+ va_arg( args, input_item_attachment_t *** );
int *pi_int = va_arg( args, int * );
if( p_sys->i_attachments <= 0 )
return VLC_EGENERIC;
- *ppp_attach = vlc_alloc( p_sys->i_attachments, sizeof(input_attachment_t*) );
+ *ppp_attach = vlc_alloc( p_sys->i_attachments, sizeof(input_item_attachment_t*) );
if (!**ppp_attach)
return VLC_ENOMEM;
*pi_int = p_sys->i_attachments;
diff --git a/modules/demux/ogg.h b/modules/demux/ogg.h
index 5c4523032d..0cb01576ca 100644
--- a/modules/demux/ogg.h
+++ b/modules/demux/ogg.h
@@ -213,7 +213,7 @@ typedef struct
/* */
int i_attachments;
- input_attachment_t **attachments;
+ input_item_attachment_t **attachments;
/* preparsing info */
bool b_preparsing_done;
diff --git a/modules/demux/xiph_metadata.c b/modules/demux/xiph_metadata.c
index 7c32675f2f..cc4bf5ead2 100644
--- a/modules/demux/xiph_metadata.c
+++ b/modules/demux/xiph_metadata.c
@@ -34,7 +34,7 @@
#include <vlc_input.h>
#include "xiph_metadata.h"
-input_attachment_t* ParseFlacPicture( const uint8_t *p_data, size_t size,
+input_item_attachment_t* ParseFlacPicture( const uint8_t *p_data, size_t size,
int i_attachments, int *i_cover_score, int *i_cover_idx )
{
/* TODO: Merge with ID3v2 copy in modules/meta_engine/taglib.cpp. */
@@ -101,7 +101,7 @@ input_attachment_t* ParseFlacPicture( const uint8_t *p_data, size_t size,
return NULL;
}
- input_attachment_t *p_attachment = NULL;
+ input_item_attachment_t *p_attachment = NULL;
char *description = strndup( (const char *)p_data, len );
if( unlikely(description == NULL) )
goto error;
@@ -348,7 +348,7 @@ static void xiph_ParseCueSheet( unsigned *pi_flags, vlc_meta_t *p_meta,
void vorbis_ParseComment( es_format_t *p_fmt, vlc_meta_t **pp_meta,
const uint8_t *p_data, size_t i_data,
- int *i_attachments, input_attachment_t ***attachments,
+ int *i_attachments, input_item_attachment_t ***attachments,
int *i_cover_score, int *i_cover_idx,
int *i_seekpoint, seekpoint_t ***ppp_seekpoint,
float (* ppf_replay_gain)[AUDIO_REPLAY_GAIN_MAX],
@@ -482,12 +482,12 @@ void vorbis_ParseComment( es_format_t *p_fmt, vlc_meta_t **pp_meta,
uint8_t *p_picture;
size_t i_size = vlc_b64_decode_binary( &p_picture, &psz_comment[strlen("METADATA_BLOCK_PICTURE=")]);
- input_attachment_t *p_attachment = ParseFlacPicture( p_picture,
+ input_item_attachment_t *p_attachment = ParseFlacPicture( p_picture,
i_size, *i_attachments, i_cover_score, i_cover_idx );
free( p_picture );
if( p_attachment )
{
- TAB_APPEND_CAST( (input_attachment_t**),
+ TAB_APPEND_CAST( (input_item_attachment_t**),
*i_attachments, *attachments, p_attachment );
}
}
diff --git a/modules/demux/xiph_metadata.h b/modules/demux/xiph_metadata.h
index 3f47300154..212b921c25 100644
--- a/modules/demux/xiph_metadata.h
+++ b/modules/demux/xiph_metadata.h
@@ -28,12 +28,12 @@
extern "C" {
# endif
-input_attachment_t* ParseFlacPicture( const uint8_t *p_data, size_t i_data,
+input_item_attachment_t* ParseFlacPicture( const uint8_t *p_data, size_t i_data,
int i_attachments, int *i_cover_score, int *i_cover_idx );
void vorbis_ParseComment( es_format_t *p_fmt, vlc_meta_t **pp_meta,
const uint8_t *p_data, size_t i_data,
- int *i_attachments, input_attachment_t ***attachments,
+ int *i_attachments, input_item_attachment_t ***attachments,
int *i_cover_score, int *i_cover_idx,
int *i_seekpoint, seekpoint_t ***ppp_seekpoint,
float (* ppf_replay_gain)[AUDIO_REPLAY_GAIN_MAX],
diff --git a/modules/meta_engine/taglib.cpp b/modules/meta_engine/taglib.cpp
index 480968edfd..6e9eb7db88 100644
--- a/modules/meta_engine/taglib.cpp
+++ b/modules/meta_engine/taglib.cpp
@@ -314,7 +314,7 @@ static void ReadMetaFromAPE( APE::Tag* tag, demux_meta_t* p_demux_meta, vlc_meta
&& !iter->second.isEmpty()
&& iter->second.type() == APE::Item::Binary)
{
- input_attachment_t *p_attachment;
+ input_item_attachment_t *p_attachment;
const ByteVector picture = iter->second.binaryData();
const char *p_data = picture.data();
@@ -336,7 +336,7 @@ static void ReadMetaFromAPE( APE::Tag* tag, demux_meta_t* p_demux_meta, vlc_meta
psz_name, p_data, i_data );
if( p_attachment )
{
- TAB_APPEND_CAST( (input_attachment_t**),
+ TAB_APPEND_CAST( (input_item_attachment_t**),
p_demux_meta->i_attachments, p_demux_meta->attachments,
p_attachment );
@@ -447,7 +447,7 @@ static void ReadMetaFromASF( ASF::Tag* tag, demux_meta_t* p_demux_meta, vlc_meta
const char *p_data = picture.data();
const unsigned i_data = picture.size();
char *psz_name;
- input_attachment_t *p_attachment;
+ input_item_attachment_t *p_attachment;
if( asfPicture.description().size() > 0 )
psz_name = strdup( asfPicture.description().toCString( true ) );
@@ -466,7 +466,7 @@ static void ReadMetaFromASF( ASF::Tag* tag, demux_meta_t* p_demux_meta, vlc_meta
p_attachment = vlc_input_attachment_New( psz_name, psz_mime,
psz_name, p_data, i_data );
if( p_attachment )
- TAB_APPEND_CAST( (input_attachment_t**),
+ TAB_APPEND_CAST( (input_item_attachment_t**),
p_demux_meta->i_attachments, p_demux_meta->attachments,
p_attachment );
char *psz_url;
@@ -559,7 +559,7 @@ static void ProcessAPICListFromId3v2( const ID3v2::FrameList &list,
if( asprintf( &psz_name, "%i", p_demux_meta->i_attachments ) == -1 )
continue;
- input_attachment_t *p_attachment =
+ input_item_attachment_t *p_attachment =
vlc_input_attachment_New( psz_name,
mimeType.toCString(),
description.toCString(),
@@ -572,7 +572,7 @@ static void ProcessAPICListFromId3v2( const ID3v2::FrameList &list,
msg_Dbg( p_demux_meta, "Found embedded art: %s (%zu bytes)",
p_attachment->psz_mime, p_attachment->i_data );
- TAB_APPEND_CAST( (input_attachment_t**),
+ TAB_APPEND_CAST( (input_item_attachment_t**),
p_demux_meta->i_attachments, p_demux_meta->attachments,
p_attachment );
@@ -750,7 +750,7 @@ static void ReadMetaFromXiph( Ogg::XiphComment* tag, demux_meta_t* p_demux_meta,
StringList mime_list { tag->fieldListMap()[ "COVERARTMIME" ] };
StringList art_list { tag->fieldListMap()[ "COVERART" ] };
- input_attachment_t *p_attachment;
+ input_item_attachment_t *p_attachment;
if( mime_list.size() != 0 && art_list.size() != 0 )
{
@@ -791,7 +791,7 @@ static void ReadMetaFromXiph( Ogg::XiphComment* tag, demux_meta_t* p_demux_meta,
}
if (p_attachment) {
- TAB_APPEND_CAST( (input_attachment_t**),
+ TAB_APPEND_CAST( (input_item_attachment_t**),
p_demux_meta->i_attachments, p_demux_meta->attachments,
p_attachment );
@@ -839,12 +839,12 @@ static void ReadMetaFromMP4( MP4::Tag* tag, demux_meta_t *p_demux_meta, vlc_meta
msg_Dbg( p_demux_meta, "Found embedded art (%s) is %i bytes",
psz_format, list[0].data().size() );
- input_attachment_t *p_attachment =
+ input_item_attachment_t *p_attachment =
vlc_input_attachment_New( "cover", psz_format, "cover",
list[0].data().data(), list[0].data().size() );
if( p_attachment )
{
- TAB_APPEND_CAST( (input_attachment_t**),
+ TAB_APPEND_CAST( (input_item_attachment_t**),
p_demux_meta->i_attachments, p_demux_meta->attachments,
p_attachment );
vlc_meta_SetArtURL( p_meta, "attachment://cover" );
diff --git a/modules/text_renderer/freetype/freetype.c b/modules/text_renderer/freetype/freetype.c
index 3303e46000..cb7d95c8f3 100644
--- a/modules/text_renderer/freetype/freetype.c
+++ b/modules/text_renderer/freetype/freetype.c
@@ -260,7 +260,7 @@ static bool IsSupportedAttachment( const char *psz_mime )
static int LoadFontsFromAttachments( filter_t *p_filter )
{
filter_sys_t *p_sys = p_filter->p_sys;
- input_attachment_t **pp_attachments;
+ input_item_attachment_t **pp_attachments;
int i_attachments_cnt;
FT_Face p_face = NULL;
@@ -280,7 +280,7 @@ static int LoadFontsFromAttachments( filter_t *p_filter )
int k = 0;
for( ; k < i_attachments_cnt; k++ )
{
- input_attachment_t *p_attach = pp_attachments[k];
+ input_item_attachment_t *p_attach = pp_attachments[k];
if( p_attach->i_data > 0 && p_attach->p_data &&
IsSupportedAttachment( p_attach->psz_mime ) )
diff --git a/modules/text_renderer/freetype/freetype.h b/modules/text_renderer/freetype/freetype.h
index ee69304ab9..302ef4ffce 100644
--- a/modules/text_renderer/freetype/freetype.h
+++ b/modules/text_renderer/freetype/freetype.h
@@ -105,7 +105,7 @@ typedef struct
float f_shadow_vector_y;
/* Attachments */
- input_attachment_t **pp_font_attachments;
+ input_item_attachment_t **pp_font_attachments;
int i_font_attachments;
/* Current scaling of the text, default is 100 (%) */
diff --git a/modules/text_renderer/freetype/platform_fonts.c b/modules/text_renderer/freetype/platform_fonts.c
index 180de9dd5e..04dd90a969 100644
--- a/modules/text_renderer/freetype/platform_fonts.c
+++ b/modules/text_renderer/freetype/platform_fonts.c
@@ -63,7 +63,7 @@ FT_Face doLoadFace( void *ctx, const char *psz_fontfile, int i_idx )
msg_Err( p_filter, "LoadFace: Invalid font attachment index" );
else
{
- input_attachment_t *p_attach = p_sys->pp_font_attachments[ i_attach ];
+ input_item_attachment_t *p_attach = p_sys->pp_font_attachments[ i_attach ];
if( FT_New_Memory_Face( p_sys->p_library, p_attach->p_data,
p_attach->i_data, i_idx, &p_face ) )
return NULL;
diff --git a/src/input/access.c b/src/input/access.c
index 6db7f337da..c4f22acd63 100644
--- a/src/input/access.c
+++ b/src/input/access.c
@@ -81,7 +81,7 @@ static stream_t *accessNewAttachment(vlc_object_t *parent,
return NULL;
input_thread_private_t *priv = input_priv(input);
- input_attachment_t *attachment = input_item_GetAttachment(priv->p_item, mrl + 13);
+ input_item_attachment_t *attachment = input_item_GetAttachment(priv->p_item, mrl + 13);
if (!attachment)
return NULL;
stream_t *stream = vlc_stream_AttachmentNew(parent, attachment);
diff --git a/src/input/attachment.c b/src/input/attachment.c
index 35064ca47c..1d938e0277 100644
--- a/src/input/attachment.c
+++ b/src/input/attachment.c
@@ -26,23 +26,23 @@
#include <vlc_input.h>
#include <vlc_atomic.h>
-struct input_attachment_priv
+struct input_item_attachment_priv
{
- input_attachment_t a;
+ input_item_attachment_t a;
vlc_atomic_rc_t rc;
};
-static struct input_attachment_priv* input_attachment_priv( input_attachment_t* a )
+static struct input_item_attachment_priv* input_item_attachment_priv( input_item_attachment_t* a )
{
- return container_of( a, struct input_attachment_priv, a );
+ return container_of( a, struct input_item_attachment_priv, a );
}
-void vlc_input_attachment_Release( input_attachment_t *a )
+void vlc_input_attachment_Release( input_item_attachment_t *a )
{
if( !a )
return;
- struct input_attachment_priv* p = input_attachment_priv( a );
+ struct input_item_attachment_priv* p = input_item_attachment_priv( a );
if( !vlc_atomic_rc_dec( &p->rc ) )
return;
@@ -54,13 +54,13 @@ void vlc_input_attachment_Release( input_attachment_t *a )
free( p );
}
-input_attachment_t *vlc_input_attachment_New( const char *psz_name,
+input_item_attachment_t *vlc_input_attachment_New( const char *psz_name,
const char *psz_mime,
const char *psz_description,
const void *p_data,
size_t i_data )
{
- struct input_attachment_priv *a = (struct input_attachment_priv *)malloc( sizeof (*a) );
+ struct input_item_attachment_priv *a = (struct input_item_attachment_priv *)malloc( sizeof (*a) );
if( unlikely(a == NULL) )
return NULL;
@@ -82,9 +82,9 @@ input_attachment_t *vlc_input_attachment_New( const char *psz_name,
return &a->a;
}
-input_attachment_t *vlc_input_attachment_Hold( input_attachment_t *a )
+input_item_attachment_t *vlc_input_attachment_Hold( input_item_attachment_t *a )
{
- struct input_attachment_priv* p = input_attachment_priv( a );
+ struct input_item_attachment_priv* p = input_item_attachment_priv( a );
vlc_atomic_rc_inc( &p->rc );
return a;
}
diff --git a/src/input/decoder.c b/src/input/decoder.c
index 793c7e687f..63ee666efe 100644
--- a/src/input/decoder.c
+++ b/src/input/decoder.c
@@ -714,7 +714,7 @@ static subpicture_t *ModuleThread_NewSpuBuffer( decoder_t *p_dec,
}
static int InputThread_GetInputAttachments( decoder_t *p_dec,
- input_attachment_t ***ppp_attachment,
+ input_item_attachment_t ***ppp_attachment,
int *pi_attachment )
{
vlc_input_decoder_t *p_owner = dec_get_owner( p_dec );
diff --git a/src/input/decoder.h b/src/input/decoder.h
index f8dede8417..4903136565 100644
--- a/src/input/decoder.h
+++ b/src/input/decoder.h
@@ -46,7 +46,7 @@ struct vlc_input_decoder_callbacks {
/* requests */
int (*get_attachments)(vlc_input_decoder_t *decoder,
- input_attachment_t ***ppp_attachment,
+ input_item_attachment_t ***ppp_attachment,
void *userdata);
};
diff --git a/src/input/es_out.c b/src/input/es_out.c
index deb81a9b06..af69347fe9 100644
--- a/src/input/es_out.c
+++ b/src/input/es_out.c
@@ -399,7 +399,7 @@ decoder_on_new_audio_stats(vlc_input_decoder_t *decoder, unsigned decoded, unsig
static int
decoder_get_attachments(vlc_input_decoder_t *decoder,
- input_attachment_t ***ppp_attachment,
+ input_item_attachment_t ***ppp_attachment,
void *userdata)
{
(void) decoder;
diff --git a/src/input/input.c b/src/input/input.c
index 0160879c39..fbc3af5ed3 100644
--- a/src/input/input.c
+++ b/src/input/input.c
@@ -107,7 +107,7 @@ static void InputGetExtraFiles( input_thread_t *p_input,
const char **psz_access, const char *psz_path );
static void AppendAttachment(input_thread_t* p_input,
- int i_new, input_attachment_t **pp_new);
+ int i_new, input_item_attachment_t **pp_new);
#define SLAVE_ADD_NOFLAG 0
#define SLAVE_ADD_FORCED (1<<0)
@@ -1112,12 +1112,12 @@ static void LoadSlaves( input_thread_t *p_input )
/* Load subtitles from attachments */
int i_attachment = 0;
- input_attachment_t **pp_attachment = NULL;
+ input_item_attachment_t **pp_attachment = NULL;
vlc_mutex_lock( &input_priv(p_input)->p_item->lock );
for( int i = 0; i < input_priv(p_input)->p_item->i_attachment; i++ )
{
- const input_attachment_t *a = input_priv(p_input)->p_item->attachment[i];
+ const input_item_attachment_t *a = input_priv(p_input)->p_item->attachment[i];
if( !strcmp( a->psz_mime, "application/x-srt" ) )
TAB_APPEND( i_attachment, pp_attachment,
vlc_input_attachment_New( a->psz_name, NULL,
@@ -1129,7 +1129,7 @@ static void LoadSlaves( input_thread_t *p_input )
var_Create( p_input, "sub-description", VLC_VAR_STRING );
for( int i = 0; i < i_attachment; i++ )
{
- input_attachment_t *a = pp_attachment[i];
+ input_item_attachment_t *a = pp_attachment[i];
if( !a )
continue;
char *psz_mrl;
@@ -2763,7 +2763,7 @@ static int InputSourceInit( input_source_t *in, input_thread_t *p_input,
}
int i_attachment;
- input_attachment_t **attachment;
+ input_item_attachment_t **attachment;
if( !demux_Control( in->p_demux, DEMUX_GET_ATTACHMENTS,
&attachment, &i_attachment ) )
{
@@ -3022,7 +3022,7 @@ static void InputMetaUser( input_thread_t *p_input, vlc_meta_t *p_meta )
}
static void AppendAttachment( input_thread_t *p_input, int i_new,
- input_attachment_t **pp_new )
+ input_item_attachment_t **pp_new )
{
input_thread_private_t *priv = input_priv( p_input );
int i_attachment = priv->p_item->i_attachment;
@@ -3032,7 +3032,7 @@ static void AppendAttachment( input_thread_t *p_input, int i_new,
/* nothing to do */
return;
- input_attachment_t **pp_att = realloc( priv->p_item->attachment,
+ input_item_attachment_t **pp_att = realloc( priv->p_item->attachment,
sizeof(*pp_att) * ( i_attachment + i_new ) );
if( likely(pp_att) )
{
@@ -3067,7 +3067,7 @@ static void InputUpdateMeta( input_thread_t *p_input, demux_t *p_demux )
/* If metadata changed, then the attachments might have changed.
We need to update them in case they contain album art. */
- input_attachment_t **attachment;
+ input_item_attachment_t **attachment;
int i_attachment;
if( !demux_Control( p_demux, DEMUX_GET_ATTACHMENTS,
diff --git a/src/input/item.c b/src/input/item.c
index 1ffcd11589..041bd96c58 100644
--- a/src/input/item.c
+++ b/src/input/item.c
@@ -1905,7 +1905,7 @@ int vlc_readdir_helper_additem(struct vlc_readdir_helper *p_rdh,
}
int input_item_GetAttachments(input_item_t *item,
- input_attachment_t ***attachments)
+ input_item_attachment_t ***attachments)
{
vlc_mutex_lock(&item->lock);
int attachments_count = item->i_attachment;
@@ -1916,7 +1916,7 @@ int input_item_GetAttachments(input_item_t *item,
return 0;
}
- *attachments = vlc_alloc(attachments_count, sizeof(input_attachment_t*));
+ *attachments = vlc_alloc(attachments_count, sizeof(input_item_attachment_t*));
if (!*attachments)
{
vlc_mutex_unlock(&item->lock);
@@ -1930,14 +1930,14 @@ int input_item_GetAttachments(input_item_t *item,
return attachments_count;
}
-input_attachment_t *input_item_GetAttachment(input_item_t *item, const char *name)
+input_item_attachment_t *input_item_GetAttachment(input_item_t *item, const char *name)
{
vlc_mutex_lock(&item->lock);
for (int i = 0; i < item->i_attachment; i++)
{
if (!strcmp( item->attachment[i]->psz_name, name))
{
- input_attachment_t *attachment =
+ input_item_attachment_t *attachment =
vlc_input_attachment_Hold(item->attachment[i] );
vlc_mutex_unlock( &item->lock );
return attachment;
diff --git a/src/input/meta.c b/src/input/meta.c
index c27ea11502..6c0964a884 100644
--- a/src/input/meta.c
+++ b/src/input/meta.c
@@ -215,7 +215,7 @@ void input_ExtractAttachmentAndCacheArt( input_thread_t *p_input,
}
/* */
- input_attachment_t *p_attachment = input_item_GetAttachment( p_item, name );
+ input_item_attachment_t *p_attachment = input_item_GetAttachment( p_item, name );
if( !p_attachment )
{
msg_Warn( p_input, "art attachment %s not found", name );
diff --git a/src/input/stream.h b/src/input/stream.h
index 941d2f0a15..01e5229929 100644
--- a/src/input/stream.h
+++ b/src/input/stream.h
@@ -37,7 +37,7 @@ void *vlc_stream_Private(stream_t *stream);
void stream_CommonDelete( stream_t *s );
stream_t *vlc_stream_AttachmentNew(vlc_object_t *p_this,
- input_attachment_t *attachement);
+ input_item_attachment_t *attachement);
/**
* This function creates a raw stream_t from an URL.
diff --git a/src/input/stream_memory.c b/src/input/stream_memory.c
index 8b03502ddb..50616ac50a 100644
--- a/src/input/stream_memory.c
+++ b/src/input/stream_memory.c
@@ -37,7 +37,7 @@ struct vlc_stream_memory_private
struct vlc_stream_attachment_private
{
struct vlc_stream_memory_private memory;
- input_attachment_t *attachment;
+ input_item_attachment_t *attachment;
};
static ssize_t Read( stream_t *, void *p_read, size_t i_read );
@@ -88,7 +88,7 @@ stream_t *(vlc_stream_MemoryNew)(vlc_object_t *p_this, uint8_t *p_buffer,
}
stream_t *vlc_stream_AttachmentNew(vlc_object_t *p_this,
- input_attachment_t *attachment)
+ input_item_attachment_t *attachment)
{
struct vlc_stream_attachment_private *p_sys;
stream_t *s = vlc_stream_CustomNew(p_this, stream_AttachmentDelete,
diff --git a/src/video_output/vout_subpictures.c b/src/video_output/vout_subpictures.c
index 484017c1ae..78d2b89f16 100644
--- a/src/video_output/vout_subpictures.c
+++ b/src/video_output/vout_subpictures.c
@@ -233,7 +233,7 @@ static void FilterRelease(filter_t *filter)
}
static int spu_get_attachments(filter_t *filter,
- input_attachment_t ***attachment_ptr,
+ input_item_attachment_t ***attachment_ptr,
int *attachment_count)
{
spu_t *spu = filter->owner.sys;
diff --git a/test/src/input/demux-run.c b/test/src/input/demux-run.c
index 428552c02d..701db775ba 100644
--- a/test/src/input/demux-run.c
+++ b/test/src/input/demux-run.c
@@ -270,7 +270,7 @@ static void demux_get_meta(demux_t *demux)
if (unlikely(p_meta == NULL) )
return;
- input_attachment_t **attachment;
+ input_item_attachment_t **attachment;
int i_attachment;
demux_Control(demux, DEMUX_GET_META, p_meta);
--
2.28.0
More information about the vlc-devel
mailing list