Prefix all _demuxer, _muxer, _protocol from libavformat and libavdevice.

This also lists the objects from those two libraries as internal (by adding
the ff_ prefix) so that they can then be hidden via linker scripts.
This commit is contained in:
Diego Elio Pettenò 2011-01-25 22:03:28 +00:00 committed by Mans Rullgard
parent 225b6d7fde
commit c6610a216e
186 changed files with 274 additions and 274 deletions

View File

@ -23,11 +23,11 @@
#include "avdevice.h"
#define REGISTER_OUTDEV(X,x) { \
extern AVOutputFormat x##_muxer; \
if(CONFIG_##X##_OUTDEV) av_register_output_format(&x##_muxer); }
extern AVOutputFormat ff_##x##_muxer; \
if(CONFIG_##X##_OUTDEV) av_register_output_format(&ff_##x##_muxer); }
#define REGISTER_INDEV(X,x) { \
extern AVInputFormat x##_demuxer; \
if(CONFIG_##X##_INDEV) av_register_input_format(&x##_demuxer); }
extern AVInputFormat ff_##x##_demuxer; \
if(CONFIG_##X##_INDEV) av_register_input_format(&ff_##x##_demuxer); }
#define REGISTER_INOUTDEV(X,x) REGISTER_OUTDEV(X,x); REGISTER_INDEV(X,x)
void avdevice_register_all(void)

View File

@ -163,7 +163,7 @@ static int audio_read_packet(AVFormatContext *s1, AVPacket *pkt)
return 0;
}
AVInputFormat alsa_demuxer = {
AVInputFormat ff_alsa_demuxer = {
"alsa",
NULL_IF_CONFIG_SMALL("ALSA audio input"),
sizeof(AlsaData),

View File

@ -93,7 +93,7 @@ static int audio_write_packet(AVFormatContext *s1, AVPacket *pkt)
return 0;
}
AVOutputFormat alsa_muxer = {
AVOutputFormat ff_alsa_muxer = {
"alsa",
NULL_IF_CONFIG_SMALL("ALSA audio output"),
"",

View File

@ -314,7 +314,7 @@ static int grab_read_close(AVFormatContext *s1)
return 0;
}
AVInputFormat bktr_demuxer = {
AVInputFormat ff_bktr_demuxer = {
"bktr",
NULL_IF_CONFIG_SMALL("video grab"),
sizeof(VideoData),

View File

@ -227,7 +227,7 @@ static int dv1394_close(AVFormatContext * context)
return 0;
}
AVInputFormat dv1394_demuxer = {
AVInputFormat ff_dv1394_demuxer = {
.name = "dv1394",
.long_name = NULL_IF_CONFIG_SMALL("DV1394 A/V grab"),
.priv_data_size = sizeof(struct dv1394_data),

View File

@ -314,7 +314,7 @@ static int audio_read_close(AVFormatContext *context)
return 0;
}
AVInputFormat jack_demuxer = {
AVInputFormat ff_jack_demuxer = {
"jack",
NULL_IF_CONFIG_SMALL("JACK Audio Connection Kit"),
sizeof(JackData),

View File

@ -348,7 +348,7 @@ static int dc1394_v2_close(AVFormatContext * context)
return 0;
}
AVInputFormat libdc1394_demuxer = {
AVInputFormat ff_libdc1394_demuxer = {
.name = "libdc1394",
.long_name = NULL_IF_CONFIG_SMALL("dc1394 v.2 A/V grab"),
.priv_data_size = sizeof(struct dc1394_data),
@ -360,7 +360,7 @@ AVInputFormat libdc1394_demuxer = {
#endif
#if HAVE_LIBDC1394_1
AVInputFormat libdc1394_demuxer = {
AVInputFormat ff_libdc1394_demuxer = {
.name = "libdc1394",
.long_name = NULL_IF_CONFIG_SMALL("dc1394 v.1 A/V grab"),
.priv_data_size = sizeof(struct dc1394_data),

View File

@ -293,7 +293,7 @@ static int audio_read_close(AVFormatContext *s1)
}
#if CONFIG_OSS_INDEV
AVInputFormat oss_demuxer = {
AVInputFormat ff_oss_demuxer = {
"oss",
NULL_IF_CONFIG_SMALL("Open Sound System capture"),
sizeof(AudioData),
@ -306,7 +306,7 @@ AVInputFormat oss_demuxer = {
#endif
#if CONFIG_OSS_OUTDEV
AVOutputFormat oss_muxer = {
AVOutputFormat ff_oss_muxer = {
"oss",
NULL_IF_CONFIG_SMALL("Open Sound System playback"),
"",

View File

@ -339,7 +339,7 @@ static int grab_read_close(AVFormatContext *s1)
return 0;
}
AVInputFormat v4l_demuxer = {
AVInputFormat ff_v4l_demuxer = {
"video4linux",
NULL_IF_CONFIG_SMALL("Video4Linux device grab"),
sizeof(VideoData),

View File

@ -680,7 +680,7 @@ static int v4l2_read_close(AVFormatContext *s1)
return 0;
}
AVInputFormat v4l2_demuxer = {
AVInputFormat ff_v4l2_demuxer = {
"video4linux2",
NULL_IF_CONFIG_SMALL("Video4Linux2 device grab"),
sizeof(struct video_data),

View File

@ -452,7 +452,7 @@ static int vfw_read_packet(AVFormatContext *s, AVPacket *pkt)
return pkt->size;
}
AVInputFormat vfwcap_demuxer = {
AVInputFormat ff_vfwcap_demuxer = {
"vfwcap",
NULL_IF_CONFIG_SMALL("VFW video capture"),
sizeof(struct vfw_ctx),

View File

@ -442,7 +442,7 @@ x11grab_read_close(AVFormatContext *s1)
}
/** x11 grabber device demuxer declaration */
AVInputFormat x11_grab_device_demuxer =
AVInputFormat ff_x11_grab_device_demuxer =
{
"x11grab",
NULL_IF_CONFIG_SMALL("X11grab"),

View File

@ -343,7 +343,7 @@ static int fourxm_read_close(AVFormatContext *s)
return 0;
}
AVInputFormat fourxm_demuxer = {
AVInputFormat ff_fourxm_demuxer = {
"4xm",
NULL_IF_CONFIG_SMALL("4X Technologies format"),
sizeof(FourxmDemuxContext),

View File

@ -164,7 +164,7 @@ static int a64_write_trailer(struct AVFormatContext *s)
return 0;
}
AVOutputFormat a64_muxer = {
AVOutputFormat ff_a64_muxer = {
.name = "a64",
.long_name = NULL_IF_CONFIG_SMALL("a64 - video for Commodore 64"),
.mime_type = NULL,

View File

@ -81,7 +81,7 @@ static int adts_aac_read_header(AVFormatContext *s,
return 0;
}
AVInputFormat aac_demuxer = {
AVInputFormat ff_aac_demuxer = {
"aac",
NULL_IF_CONFIG_SMALL("raw ADTS AAC"),
0,

View File

@ -70,7 +70,7 @@ static int ac3_probe(AVProbeData *p)
return ac3_eac3_probe(p, CODEC_ID_AC3);
}
AVInputFormat ac3_demuxer = {
AVInputFormat ff_ac3_demuxer = {
"ac3",
NULL_IF_CONFIG_SMALL("raw AC-3"),
0,
@ -89,7 +89,7 @@ static int eac3_probe(AVProbeData *p)
return ac3_eac3_probe(p, CODEC_ID_EAC3);
}
AVInputFormat eac3_demuxer = {
AVInputFormat ff_eac3_demuxer = {
"eac3",
NULL_IF_CONFIG_SMALL("raw E-AC-3"),
0,

View File

@ -137,7 +137,7 @@ static int adts_write_packet(AVFormatContext *s, AVPacket *pkt)
return 0;
}
AVOutputFormat adts_muxer = {
AVOutputFormat ff_adts_muxer = {
"adts",
NULL_IF_CONFIG_SMALL("ADTS AAC"),
"audio/aac",

View File

@ -93,7 +93,7 @@ static int aea_read_packet(AVFormatContext *s, AVPacket *pkt)
return ret;
}
AVInputFormat aea_demuxer = {
AVInputFormat ff_aea_demuxer = {
"aea",
NULL_IF_CONFIG_SMALL("MD STUDIO audio"),
0,

View File

@ -311,7 +311,7 @@ static int aiff_read_packet(AVFormatContext *s,
return 0;
}
AVInputFormat aiff_demuxer = {
AVInputFormat ff_aiff_demuxer = {
"aiff",
NULL_IF_CONFIG_SMALL("Audio IFF"),
sizeof(AIFFInputContext),

View File

@ -145,7 +145,7 @@ static int aiff_write_trailer(AVFormatContext *s)
return 0;
}
AVOutputFormat aiff_muxer = {
AVOutputFormat ff_aiff_muxer = {
"aiff",
NULL_IF_CONFIG_SMALL("Audio IFF"),
"audio/aiff",

View File

@ -23,18 +23,18 @@
#include "rdt.h"
#define REGISTER_MUXER(X,x) { \
extern AVOutputFormat x##_muxer; \
if(CONFIG_##X##_MUXER) av_register_output_format(&x##_muxer); }
extern AVOutputFormat ff_##x##_muxer; \
if(CONFIG_##X##_MUXER) av_register_output_format(&ff_##x##_muxer); }
#define REGISTER_DEMUXER(X,x) { \
extern AVInputFormat x##_demuxer; \
if(CONFIG_##X##_DEMUXER) av_register_input_format(&x##_demuxer); }
extern AVInputFormat ff_##x##_demuxer; \
if(CONFIG_##X##_DEMUXER) av_register_input_format(&ff_##x##_demuxer); }
#define REGISTER_MUXDEMUX(X,x) REGISTER_MUXER(X,x); REGISTER_DEMUXER(X,x)
#define REGISTER_PROTOCOL(X,x) { \
extern URLProtocol x##_protocol; \
if(CONFIG_##X##_PROTOCOL) av_register_protocol2(&x##_protocol, sizeof(x##_protocol)); }
extern URLProtocol ff_##x##_protocol; \
if(CONFIG_##X##_PROTOCOL) av_register_protocol2(&ff_##x##_protocol, sizeof(ff_##x##_protocol)); }
void av_register_all(void)
{

View File

@ -169,7 +169,7 @@ static int amr_read_packet(AVFormatContext *s,
}
#if CONFIG_AMR_DEMUXER
AVInputFormat amr_demuxer = {
AVInputFormat ff_amr_demuxer = {
"amr",
NULL_IF_CONFIG_SMALL("3GPP AMR file format"),
0, /*priv_data_size*/
@ -181,7 +181,7 @@ AVInputFormat amr_demuxer = {
#endif
#if CONFIG_AMR_MUXER
AVOutputFormat amr_muxer = {
AVOutputFormat ff_amr_muxer = {
"amr",
NULL_IF_CONFIG_SMALL("3GPP AMR file format"),
"audio/amr",

View File

@ -225,7 +225,7 @@ repeat:
return 0;
}
AVInputFormat anm_demuxer = {
AVInputFormat ff_anm_demuxer = {
"anm",
NULL_IF_CONFIG_SMALL("Deluxe Paint Animation"),
sizeof(AnmDemuxContext),

View File

@ -80,7 +80,7 @@ static int apc_read_packet(AVFormatContext *s, AVPacket *pkt)
return 0;
}
AVInputFormat apc_demuxer = {
AVInputFormat ff_apc_demuxer = {
"apc",
NULL_IF_CONFIG_SMALL("CRYO APC format"),
0,

View File

@ -391,7 +391,7 @@ static int ape_read_seek(AVFormatContext *s, int stream_index, int64_t timestamp
return 0;
}
AVInputFormat ape_demuxer = {
AVInputFormat ff_ape_demuxer = {
"ape",
NULL_IF_CONFIG_SMALL("Monkey's Audio"),
sizeof(APEContext),

View File

@ -579,7 +579,7 @@ static int applehttp_probe(AVProbeData *p)
return 0;
}
AVInputFormat applehttp_demuxer = {
AVInputFormat ff_applehttp_demuxer = {
"applehttp",
NULL_IF_CONFIG_SMALL("Apple HTTP Live Streaming format"),
sizeof(AppleHTTPContext),

View File

@ -229,7 +229,7 @@ extern const AVMetadataConv ff_asf_metadata_conv[];
#define ASF_PL_FLAG_KEY_FRAME 0x80 //1000 0000
extern AVInputFormat asf_demuxer;
extern AVInputFormat ff_asf_demuxer;
int ff_guidcmp(const void *g1, const void *g2);
void ff_get_guid(ByteIOContext *s, ff_asf_guid *g);

View File

@ -1203,7 +1203,7 @@ static int asf_read_seek(AVFormatContext *s, int stream_index, int64_t pts, int
return 0;
}
AVInputFormat asf_demuxer = {
AVInputFormat ff_asf_demuxer = {
"asf",
NULL_IF_CONFIG_SMALL("ASF format"),
sizeof(ASFContext),

View File

@ -855,7 +855,7 @@ static int asf_write_trailer(AVFormatContext *s)
}
#if CONFIG_ASF_MUXER
AVOutputFormat asf_muxer = {
AVOutputFormat ff_asf_muxer = {
"asf",
NULL_IF_CONFIG_SMALL("ASF format"),
"video/x-ms-asf",
@ -876,7 +876,7 @@ AVOutputFormat asf_muxer = {
#endif
#if CONFIG_ASF_STREAM_MUXER
AVOutputFormat asf_stream_muxer = {
AVOutputFormat ff_asf_stream_muxer = {
"asf_stream",
NULL_IF_CONFIG_SMALL("ASF format"),
"video/x-ms-asf",

View File

@ -202,7 +202,7 @@ static int read_seek2(AVFormatContext *s, int stream_index,
return 0;
}
AVInputFormat ass_demuxer = {
AVInputFormat ff_ass_demuxer = {
.name = "ass",
.long_name = NULL_IF_CONFIG_SMALL("Advanced SubStation Alpha subtitle format"),
.priv_data_size = sizeof(ASSContext),

View File

@ -77,7 +77,7 @@ static int write_trailer(AVFormatContext *s)
return 0;
}
AVOutputFormat ass_muxer = {
AVOutputFormat ff_ass_muxer = {
.name = "ass",
.long_name = NULL_IF_CONFIG_SMALL("Advanced SubStation Alpha subtitle format"),
.mime_type = "text/x-ssa",

View File

@ -183,7 +183,7 @@ static int au_read_packet(AVFormatContext *s,
}
#if CONFIG_AU_DEMUXER
AVInputFormat au_demuxer = {
AVInputFormat ff_au_demuxer = {
"au",
NULL_IF_CONFIG_SMALL("SUN AU format"),
0,
@ -197,7 +197,7 @@ AVInputFormat au_demuxer = {
#endif
#if CONFIG_AU_MUXER
AVOutputFormat au_muxer = {
AVOutputFormat ff_au_muxer = {
"au",
NULL_IF_CONFIG_SMALL("SUN AU format"),
"audio/basic",

View File

@ -1373,7 +1373,7 @@ static int avi_probe(AVProbeData *p)
return 0;
}
AVInputFormat avi_demuxer = {
AVInputFormat ff_avi_demuxer = {
"avi",
NULL_IF_CONFIG_SMALL("AVI format"),
sizeof(AVIContext),

View File

@ -630,7 +630,7 @@ static int avi_write_trailer(AVFormatContext *s)
return res;
}
AVOutputFormat avi_muxer = {
AVOutputFormat ff_avi_muxer = {
"avi",
NULL_IF_CONFIG_SMALL("AVI format"),
"video/x-msvideo",

View File

@ -207,7 +207,7 @@ static int avisynth_read_seek(AVFormatContext *s, int stream_index, int64_t pts,
return 0;
}
AVInputFormat avisynth_demuxer = {
AVInputFormat ff_avisynth_demuxer = {
"avs",
NULL_IF_CONFIG_SMALL("AVISynth"),
sizeof(AVISynthContext),

View File

@ -215,7 +215,7 @@ static int avs_read_close(AVFormatContext * s)
return 0;
}
AVInputFormat avs_demuxer = {
AVInputFormat ff_avs_demuxer = {
"avs",
NULL_IF_CONFIG_SMALL("AVS format"),
sizeof(AvsFormat),

View File

@ -224,7 +224,7 @@ static int vid_read_packet(AVFormatContext *s,
return 0;
}
AVInputFormat bethsoftvid_demuxer = {
AVInputFormat ff_bethsoftvid_demuxer = {
"bethsoftvid",
NULL_IF_CONFIG_SMALL("Bethesda Softworks VID format"),
sizeof(BVID_DemuxContext),

View File

@ -158,7 +158,7 @@ static int bfi_read_packet(AVFormatContext * s, AVPacket * pkt)
return ret;
}
AVInputFormat bfi_demuxer = {
AVInputFormat ff_bfi_demuxer = {
"bfi",
NULL_IF_CONFIG_SMALL("Brute Force & Ignorance"),
sizeof(BFIContext),

View File

@ -257,7 +257,7 @@ static int read_seek(AVFormatContext *s, int stream_index, int64_t timestamp, in
return 0;
}
AVInputFormat bink_demuxer = {
AVInputFormat ff_bink_demuxer = {
"bink",
NULL_IF_CONFIG_SMALL("Bink"),
sizeof(BinkDemuxContext),

View File

@ -192,7 +192,7 @@ static int read_packet(AVFormatContext *s, AVPacket *pkt)
return ret;
}
AVInputFormat c93_demuxer = {
AVInputFormat ff_c93_demuxer = {
"c93",
NULL_IF_CONFIG_SMALL("Interplay C93"),
sizeof(C93DemuxContext),

View File

@ -381,7 +381,7 @@ static int read_seek(AVFormatContext *s, int stream_index,
return 0;
}
AVInputFormat caf_demuxer = {
AVInputFormat ff_caf_demuxer = {
"caf",
NULL_IF_CONFIG_SMALL("Apple Core Audio Format"),
sizeof(CaffContext),

View File

@ -65,7 +65,7 @@ static int cavsvideo_probe(AVProbeData *p)
return 0;
}
AVInputFormat cavsvideo_demuxer = {
AVInputFormat ff_cavsvideo_demuxer = {
"cavsvideo",
NULL_IF_CONFIG_SMALL("raw Chinese AVS video"),
0,

View File

@ -55,7 +55,7 @@ static int read_packet(AVFormatContext *s, AVPacket *pkt)
return ret;
}
AVInputFormat cdg_demuxer = {
AVInputFormat ff_cdg_demuxer = {
"cdg",
NULL_IF_CONFIG_SMALL("CD Graphics Format"),
0,

View File

@ -188,7 +188,7 @@ static int64_t concat_seek(URLContext *h, int64_t pos, int whence)
return result;
}
URLProtocol concat_protocol = {
URLProtocol ff_concat_protocol = {
"concat",
concat_open,
concat_read,

View File

@ -54,7 +54,7 @@ static int crc_write_trailer(struct AVFormatContext *s)
return 0;
}
AVOutputFormat crc_muxer = {
AVOutputFormat ff_crc_muxer = {
"crc",
NULL_IF_CONFIG_SMALL("CRC testing format"),
NULL,

View File

@ -65,7 +65,7 @@ static int daud_write_packet(struct AVFormatContext *s, AVPacket *pkt)
}
#if CONFIG_DAUD_DEMUXER
AVInputFormat daud_demuxer = {
AVInputFormat ff_daud_demuxer = {
"daud",
NULL_IF_CONFIG_SMALL("D-Cinema audio format"),
0,
@ -79,7 +79,7 @@ AVInputFormat daud_demuxer = {
#endif
#if CONFIG_DAUD_MUXER
AVOutputFormat daud_muxer =
AVOutputFormat ff_daud_muxer =
{
"daud",
NULL_IF_CONFIG_SMALL("D-Cinema audio format"),

View File

@ -31,7 +31,7 @@ static int dirac_probe(AVProbeData *p)
return 0;
}
AVInputFormat dirac_demuxer = {
AVInputFormat ff_dirac_demuxer = {
"dirac",
NULL_IF_CONFIG_SMALL("raw Dirac"),
0,

View File

@ -42,7 +42,7 @@ static int dnxhd_probe(AVProbeData *p)
return AVPROBE_SCORE_MAX;
}
AVInputFormat dnxhd_demuxer = {
AVInputFormat ff_dnxhd_demuxer = {
"dnxhd",
NULL_IF_CONFIG_SMALL("raw DNxHD (SMPTE VC-3)"),
0,

View File

@ -216,7 +216,7 @@ static int cin_read_packet(AVFormatContext *s, AVPacket *pkt)
return 0;
}
AVInputFormat dsicin_demuxer = {
AVInputFormat ff_dsicin_demuxer = {
"dsicin",
NULL_IF_CONFIG_SMALL("Delphine Software International CIN format"),
sizeof(CinDemuxContext),

View File

@ -65,7 +65,7 @@ static int dts_probe(AVProbeData *p)
return 0;
}
AVInputFormat dts_demuxer = {
AVInputFormat ff_dts_demuxer = {
"dts",
NULL_IF_CONFIG_SMALL("raw DTS"),
0,

View File

@ -518,7 +518,7 @@ static int dv_probe(AVProbeData *p)
}
#if CONFIG_DV_DEMUXER
AVInputFormat dv_demuxer = {
AVInputFormat ff_dv_demuxer = {
"dv",
NULL_IF_CONFIG_SMALL("DV video format"),
sizeof(RawDVContext),

View File

@ -399,7 +399,7 @@ static int dv_write_trailer(struct AVFormatContext *s)
return 0;
}
AVOutputFormat dv_muxer = {
AVOutputFormat ff_dv_muxer = {
"dv",
NULL_IF_CONFIG_SMALL("DV video format"),
NULL,

View File

@ -209,7 +209,7 @@ static int dxa_read_packet(AVFormatContext *s, AVPacket *pkt)
return AVERROR(EIO);
}
AVInputFormat dxa_demuxer = {
AVInputFormat ff_dxa_demuxer = {
"dxa",
NULL_IF_CONFIG_SMALL("DXA"),
sizeof(DXAContext),

View File

@ -90,7 +90,7 @@ static int cdata_read_packet(AVFormatContext *s, AVPacket *pkt)
return 0;
}
AVInputFormat ea_cdata_demuxer = {
AVInputFormat ff_ea_cdata_demuxer = {
"ea_cdata",
NULL_IF_CONFIG_SMALL("Electronic Arts cdata"),
sizeof(CdataDemuxContext),

View File

@ -568,7 +568,7 @@ get_video_packet:
return ret;
}
AVInputFormat ea_demuxer = {
AVInputFormat ff_ea_demuxer = {
"ea",
NULL_IF_CONFIG_SMALL("Electronic Arts Multimedia Format"),
sizeof(EaDemuxContext),

View File

@ -518,7 +518,7 @@ static int ffm_probe(AVProbeData *p)
return 0;
}
AVInputFormat ffm_demuxer = {
AVInputFormat ff_ffm_demuxer = {
"ffm",
NULL_IF_CONFIG_SMALL("FFM (FFserver live feed) format"),
sizeof(FFMContext),

View File

@ -240,7 +240,7 @@ static int ffm_write_trailer(AVFormatContext *s)
return 0;
}
AVOutputFormat ffm_muxer = {
AVOutputFormat ff_ffm_muxer = {
"ffm",
NULL_IF_CONFIG_SMALL("FFM (FFserver live feed) format"),
"",

View File

@ -163,7 +163,7 @@ static int read_packet(AVFormatContext *s, AVPacket *pkt)
return AVERROR_EOF;
}
AVInputFormat ffmetadata_demuxer = {
AVInputFormat ff_ffmetadata_demuxer = {
.name = "ffmetadata",
.long_name = NULL_IF_CONFIG_SMALL("FFmpeg metadata in text format"),
.read_probe = probe,

View File

@ -89,7 +89,7 @@ static int write_packet(AVFormatContext *s, AVPacket *pkt)
return 0;
}
AVOutputFormat ffmetadata_muxer = {
AVOutputFormat ff_ffmetadata_muxer = {
.name = "ffmetadata",
.long_name = NULL_IF_CONFIG_SMALL("FFmpeg metadata in text format"),
.extensions = "ffmeta",

View File

@ -94,7 +94,7 @@ static int file_close(URLContext *h)
return close(fd);
}
URLProtocol file_protocol = {
URLProtocol ff_file_protocol = {
"file",
file_open,
file_read,
@ -130,7 +130,7 @@ static int pipe_open(URLContext *h, const char *filename, int flags)
return 0;
}
URLProtocol pipe_protocol = {
URLProtocol ff_pipe_protocol = {
"pipe",
pipe_open,
file_read,

View File

@ -98,7 +98,7 @@ static int read_seek(AVFormatContext *s, int stream_index, int64_t timestamp, in
return 0;
}
AVInputFormat filmstrip_demuxer = {
AVInputFormat ff_filmstrip_demuxer = {
"filmstrip",
NULL_IF_CONFIG_SMALL("Adobe Filmstrip"),
sizeof(FilmstripDemuxContext),

View File

@ -71,7 +71,7 @@ static int write_trailer(AVFormatContext *s)
return 0;
}
AVOutputFormat filmstrip_muxer = {
AVOutputFormat ff_filmstrip_muxer = {
"filmstrip",
NULL_IF_CONFIG_SMALL("Adobe Filmstrip"),
NULL,

View File

@ -123,7 +123,7 @@ static int flac_probe(AVProbeData *p)
else return AVPROBE_SCORE_MAX/2;
}
AVInputFormat flac_demuxer = {
AVInputFormat ff_flac_demuxer = {
"flac",
NULL_IF_CONFIG_SMALL("raw FLAC"),
0,

View File

@ -118,7 +118,7 @@ static int flac_write_packet(struct AVFormatContext *s, AVPacket *pkt)
return 0;
}
AVOutputFormat flac_muxer = {
AVOutputFormat ff_flac_muxer = {
"flac",
NULL_IF_CONFIG_SMALL("raw FLAC"),
"audio/x-flac",

View File

@ -259,7 +259,7 @@ static int flic_read_packet(AVFormatContext *s,
return ret;
}
AVInputFormat flic_demuxer = {
AVInputFormat ff_flic_demuxer = {
"flic",
NULL_IF_CONFIG_SMALL("FLI/FLC/FLX animation format"),
sizeof(FlicDemuxContext),

View File

@ -491,7 +491,7 @@ static int flv_read_seek2(AVFormatContext *s, int stream_index,
}
#endif
AVInputFormat flv_demuxer = {
AVInputFormat ff_flv_demuxer = {
"flv",
NULL_IF_CONFIG_SMALL("FLV format"),
sizeof(FLVContext),

View File

@ -437,7 +437,7 @@ static int flv_write_packet(AVFormatContext *s, AVPacket *pkt)
return 0;
}
AVOutputFormat flv_muxer = {
AVOutputFormat ff_flv_muxer = {
"flv",
NULL_IF_CONFIG_SMALL("FLV format"),
"video/x-flv",

View File

@ -33,7 +33,7 @@ static int framecrc_write_packet(struct AVFormatContext *s, AVPacket *pkt)
return 0;
}
AVOutputFormat framecrc_muxer = {
AVOutputFormat ff_framecrc_muxer = {
"framecrc",
NULL_IF_CONFIG_SMALL("framecrc testing format"),
NULL,

View File

@ -344,7 +344,7 @@ static int gif_write_trailer(AVFormatContext *s)
return 0;
}
AVOutputFormat gif_muxer = {
AVOutputFormat ff_gif_muxer = {
"gif",
NULL_IF_CONFIG_SMALL("GIF Animation"),
"image/gif",

View File

@ -119,7 +119,7 @@ static int gopher_read(URLContext *h, uint8_t *buf, int size)
}
URLProtocol gopher_protocol = {
URLProtocol ff_gopher_protocol = {
"gopher",
gopher_open,
gopher_read,

View File

@ -515,7 +515,7 @@ static int64_t gxf_read_timestamp(AVFormatContext *s, int stream_index,
return res;
}
AVInputFormat gxf_demuxer = {
AVInputFormat ff_gxf_demuxer = {
"gxf",
NULL_IF_CONFIG_SMALL("GXF format"),
0,

View File

@ -927,7 +927,7 @@ static int gxf_interleave_packet(AVFormatContext *s, AVPacket *out, AVPacket *pk
av_interleave_packet_per_dts, gxf_compare_field_nb);
}
AVOutputFormat gxf_muxer = {
AVOutputFormat ff_gxf_muxer = {
"gxf",
NULL_IF_CONFIG_SMALL("GXF format"),
NULL,

View File

@ -62,7 +62,7 @@ static int h261_probe(AVProbeData *p)
return 0;
}
AVInputFormat h261_demuxer = {
AVInputFormat ff_h261_demuxer = {
"h261",
NULL_IF_CONFIG_SMALL("raw H.261"),
0,

View File

@ -64,7 +64,7 @@ static int h263_probe(AVProbeData *p)
return 0;
}
AVInputFormat h263_demuxer = {
AVInputFormat ff_h263_demuxer = {
"h263",
NULL_IF_CONFIG_SMALL("raw H.263"),
0,

View File

@ -67,7 +67,7 @@ static int h264_probe(AVProbeData *p)
return 0;
}
AVInputFormat h264_demuxer = {
AVInputFormat ff_h264_demuxer = {
"h264",
NULL_IF_CONFIG_SMALL("raw H.264 video format"),
0,

View File

@ -503,7 +503,7 @@ http_get_file_handle(URLContext *h)
return url_get_file_handle(s->hd);
}
URLProtocol http_protocol = {
URLProtocol ff_http_protocol = {
"http",
http_open,
http_read,

View File

@ -286,7 +286,7 @@ static int idcin_read_packet(AVFormatContext *s,
return ret;
}
AVInputFormat idcin_demuxer = {
AVInputFormat ff_idcin_demuxer = {
"idcin",
NULL_IF_CONFIG_SMALL("id Cinematic format"),
sizeof(IdcinDemuxContext),

View File

@ -216,7 +216,7 @@ static int roq_read_packet(AVFormatContext *s,
return ret;
}
AVInputFormat roq_demuxer = {
AVInputFormat ff_roq_demuxer = {
"RoQ",
NULL_IF_CONFIG_SMALL("id RoQ format"),
sizeof(RoqDemuxContext),

View File

@ -35,7 +35,7 @@ static int roq_write_header(struct AVFormatContext *s)
return 0;
}
AVOutputFormat roq_muxer =
AVOutputFormat ff_roq_muxer =
{
"RoQ",
NULL_IF_CONFIG_SMALL("raw id RoQ format"),

View File

@ -314,7 +314,7 @@ static int iff_read_packet(AVFormatContext *s,
return ret;
}
AVInputFormat iff_demuxer = {
AVInputFormat ff_iff_demuxer = {
"IFF",
NULL_IF_CONFIG_SMALL("IFF format"),
sizeof(IffDemuxContext),

View File

@ -412,7 +412,7 @@ static int write_packet(AVFormatContext *s, AVPacket *pkt)
/* input */
#if CONFIG_IMAGE2_DEMUXER
AVInputFormat image2_demuxer = {
AVInputFormat ff_image2_demuxer = {
.name = "image2",
.long_name = NULL_IF_CONFIG_SMALL("image2 sequence"),
.priv_data_size = sizeof(VideoData),
@ -423,7 +423,7 @@ AVInputFormat image2_demuxer = {
};
#endif
#if CONFIG_IMAGE2PIPE_DEMUXER
AVInputFormat image2pipe_demuxer = {
AVInputFormat ff_image2pipe_demuxer = {
.name = "image2pipe",
.long_name = NULL_IF_CONFIG_SMALL("piped image2 sequence"),
.priv_data_size = sizeof(VideoData),
@ -434,7 +434,7 @@ AVInputFormat image2pipe_demuxer = {
/* output */
#if CONFIG_IMAGE2_MUXER
AVOutputFormat image2_muxer = {
AVOutputFormat ff_image2_muxer = {
.name = "image2",
.long_name = NULL_IF_CONFIG_SMALL("image2 sequence"),
.extensions = "bmp,jpeg,jpg,ljpg,pam,pbm,pcx,pgm,pgmyuv,png,"
@ -447,7 +447,7 @@ AVOutputFormat image2_muxer = {
};
#endif
#if CONFIG_IMAGE2PIPE_MUXER
AVOutputFormat image2pipe_muxer = {
AVOutputFormat ff_image2pipe_muxer = {
.name = "image2pipe",
.long_name = NULL_IF_CONFIG_SMALL("piped image2 sequence"),
.priv_data_size = sizeof(VideoData),

View File

@ -58,7 +58,7 @@ static int ingenient_read_packet(AVFormatContext *s, AVPacket *pkt)
return ret;
}
AVInputFormat ingenient_demuxer = {
AVInputFormat ff_ingenient_demuxer = {
"ingenient",
NULL_IF_CONFIG_SMALL("raw Ingenient MJPEG"),
0,

View File

@ -620,7 +620,7 @@ static int ipmovie_read_packet(AVFormatContext *s,
return ret;
}
AVInputFormat ipmovie_demuxer = {
AVInputFormat ff_ipmovie_demuxer = {
"ipmovie",
NULL_IF_CONFIG_SMALL("Interplay MVE format"),
sizeof(IPMVEContext),

View File

@ -122,7 +122,7 @@ static int iss_read_packet(AVFormatContext *s, AVPacket *pkt)
return 0;
}
AVInputFormat iss_demuxer = {
AVInputFormat ff_iss_demuxer = {
"ISS",
NULL_IF_CONFIG_SMALL("Funcom ISS format"),
sizeof(IssDemuxContext),

View File

@ -84,7 +84,7 @@ retry:
return ret;
}
AVInputFormat iv8_demuxer = {
AVInputFormat ff_iv8_demuxer = {
"iv8",
NULL_IF_CONFIG_SMALL("A format generated by IndigoVision 8000 video server"),
0,

View File

@ -79,7 +79,7 @@ static int read_packet(AVFormatContext *s, AVPacket *pkt)
return ret;
}
AVInputFormat ivf_demuxer = {
AVInputFormat ff_ivf_demuxer = {
"ivf",
NULL_IF_CONFIG_SMALL("On2 IVF"),
0,

View File

@ -58,7 +58,7 @@ static int ivf_write_packet(AVFormatContext *s, AVPacket *pkt)
return 0;
}
AVOutputFormat ivf_muxer = {
AVOutputFormat ff_ivf_muxer = {
.name = "ivf",
.long_name = NULL_IF_CONFIG_SMALL("On2 IVF"),
.extensions = "ivf",

View File

@ -150,7 +150,7 @@ static int nut_write_trailer(AVFormatContext * avf) {
return 0;
}
AVOutputFormat libnut_muxer = {
AVOutputFormat ff_libnut_muxer = {
"libnut",
"nut format",
"video/x-nut",
@ -297,7 +297,7 @@ static int nut_read_close(AVFormatContext *s) {
return 0;
}
AVInputFormat libnut_demuxer = {
AVInputFormat ff_libnut_demuxer = {
"libnut",
NULL_IF_CONFIG_SMALL("NUT format"),
sizeof(NUTContext),

View File

@ -157,7 +157,7 @@ static int rtmp_get_file_handle(URLContext *s)
return RTMP_Socket(r);
}
URLProtocol rtmp_protocol = {
URLProtocol ff_rtmp_protocol = {
"rtmp",
rtmp_open,
rtmp_read,
@ -170,7 +170,7 @@ URLProtocol rtmp_protocol = {
rtmp_get_file_handle
};
URLProtocol rtmpt_protocol = {
URLProtocol ff_rtmpt_protocol = {
"rtmpt",
rtmp_open,
rtmp_read,
@ -183,7 +183,7 @@ URLProtocol rtmpt_protocol = {
rtmp_get_file_handle
};
URLProtocol rtmpe_protocol = {
URLProtocol ff_rtmpe_protocol = {
"rtmpe",
rtmp_open,
rtmp_read,
@ -196,7 +196,7 @@ URLProtocol rtmpe_protocol = {
rtmp_get_file_handle
};
URLProtocol rtmpte_protocol = {
URLProtocol ff_rtmpte_protocol = {
"rtmpte",
rtmp_open,
rtmp_read,
@ -209,7 +209,7 @@ URLProtocol rtmpte_protocol = {
rtmp_get_file_handle
};
URLProtocol rtmps_protocol = {
URLProtocol ff_rtmps_protocol = {
"rtmps",
rtmp_open,
rtmp_read,

View File

@ -117,7 +117,7 @@ static int lmlm4_read_packet(AVFormatContext *s, AVPacket *pkt) {
return ret;
}
AVInputFormat lmlm4_demuxer = {
AVInputFormat ff_lmlm4_demuxer = {
"lmlm4",
NULL_IF_CONFIG_SMALL("lmlm4 raw format"),
0,

View File

@ -336,7 +336,7 @@ static int lxf_read_packet(AVFormatContext *s, AVPacket *pkt)
return ret;
}
AVInputFormat lxf_demuxer = {
AVInputFormat ff_lxf_demuxer = {
.name = "lxf",
.long_name = NULL_IF_CONFIG_SMALL("VR native stream format (LXF)"),
.priv_data_size = sizeof(LXFDemuxContext),

View File

@ -49,7 +49,7 @@ static int mpeg4video_probe(AVProbeData *probe_packet)
return 0;
}
AVInputFormat m4v_demuxer = {
AVInputFormat ff_m4v_demuxer = {
"m4v",
NULL_IF_CONFIG_SMALL("raw MPEG-4 video format"),
0,

View File

@ -1920,7 +1920,7 @@ static int matroska_read_close(AVFormatContext *s)
return 0;
}
AVInputFormat matroska_demuxer = {
AVInputFormat ff_matroska_demuxer = {
"matroska,webm",
NULL_IF_CONFIG_SMALL("Matroska/WebM file format"),
sizeof(MatroskaDemuxContext),

View File

@ -1177,7 +1177,7 @@ static int mkv_write_trailer(AVFormatContext *s)
}
#if CONFIG_MATROSKA_MUXER
AVOutputFormat matroska_muxer = {
AVOutputFormat ff_matroska_muxer = {
"matroska",
NULL_IF_CONFIG_SMALL("Matroska file format"),
"video/x-matroska",
@ -1195,7 +1195,7 @@ AVOutputFormat matroska_muxer = {
#endif
#if CONFIG_WEBM_MUXER
AVOutputFormat webm_muxer = {
AVOutputFormat ff_webm_muxer = {
"webm",
NULL_IF_CONFIG_SMALL("WebM file format"),
"video/webm",
@ -1211,7 +1211,7 @@ AVOutputFormat webm_muxer = {
#endif
#if CONFIG_MATROSKA_AUDIO_MUXER
AVOutputFormat matroska_audio_muxer = {
AVOutputFormat ff_matroska_audio_muxer = {
"matroska",
NULL_IF_CONFIG_SMALL("Matroska file format"),
"audio/x-matroska",

View File

@ -65,7 +65,7 @@ static int write_trailer(struct AVFormatContext *s)
return 0;
}
AVOutputFormat md5_muxer = {
AVOutputFormat ff_md5_muxer = {
"md5",
NULL_IF_CONFIG_SMALL("MD5 testing format"),
NULL,
@ -95,7 +95,7 @@ static int framemd5_write_packet(struct AVFormatContext *s, AVPacket *pkt)
return 0;
}
AVOutputFormat framemd5_muxer = {
AVOutputFormat ff_framemd5_muxer = {
"framemd5",
NULL_IF_CONFIG_SMALL("Per-frame MD5 testing format"),
NULL,

View File

@ -82,7 +82,7 @@ static int md5_get_handle(URLContext *h)
return (intptr_t)h->priv_data;
}
URLProtocol md5_protocol = {
URLProtocol ff_md5_protocol = {
.name = "md5",
.url_open = md5_open,
.url_write = md5_write,

View File

@ -188,7 +188,7 @@ static int read_packet(AVFormatContext *s,
return 0;
}
AVInputFormat mm_demuxer = {
AVInputFormat ff_mm_demuxer = {
"mm",
NULL_IF_CONFIG_SMALL("American Laser Games MM format"),
sizeof(MmDemuxContext),

View File

@ -291,7 +291,7 @@ static int mmf_read_packet(AVFormatContext *s,
}
#if CONFIG_MMF_DEMUXER
AVInputFormat mmf_demuxer = {
AVInputFormat ff_mmf_demuxer = {
"mmf",
NULL_IF_CONFIG_SMALL("Yamaha SMAF"),
sizeof(MMFContext),
@ -303,7 +303,7 @@ AVInputFormat mmf_demuxer = {
};
#endif
#if CONFIG_MMF_MUXER
AVOutputFormat mmf_muxer = {
AVOutputFormat ff_mmf_muxer = {
"mmf",
NULL_IF_CONFIG_SMALL("Yamaha SMAF"),
"application/vnd.smaf",

View File

@ -359,7 +359,7 @@ static int mmsh_read(URLContext *h, uint8_t *buf, int size)
return res;
}
URLProtocol mmsh_protocol = {
URLProtocol ff_mmsh_protocol = {
.name = "mmsh",
.url_open = mmsh_open,
.url_read = mmsh_read,

View File

@ -621,7 +621,7 @@ static int mms_read(URLContext *h, uint8_t *buf, int size)
return result;
}
URLProtocol mmst_protocol = {
URLProtocol ff_mmst_protocol = {
"mmst",
mms_open,
mms_read,

Some files were not shown because too many files have changed in this diff Show More