falkTX
/
FFmpeg
mirror of https://github.com/falkTX/FFmpeg.git
1
0
Fork 0
Code Issues 0 Releases 338 Wiki Activity
Browse Source

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.
(cherry picked from commit c6610a216e)
tags/n0.8
Diego Elio Pettenò Michael Niedermayer 14 years ago
parent
ebf3ee16c7
commit
66355be3c3
100 changed files with 128 additions and 128 deletions
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. +4
    -4
      libavdevice/alldevices.c
  2. +1
    -1
      libavdevice/alsa-audio-dec.c
  3. +1
    -1
      libavdevice/alsa-audio-enc.c
  4. +1
    -1
      libavdevice/bktr.c
  5. +1
    -1
      libavdevice/dv1394.c
  6. +1
    -1
      libavdevice/jack_audio.c
  7. +2
    -2
      libavdevice/libdc1394.c
  8. +2
    -2
      libavdevice/oss_audio.c
  9. +1
    -1
      libavdevice/v4l.c
  10. +1
    -1
      libavdevice/v4l2.c
  11. +1
    -1
      libavdevice/vfwcap.c
  12. +1
    -1
      libavdevice/x11grab.c
  13. +1
    -1
      libavformat/4xm.c
  14. +1
    -1
      libavformat/a64.c
  15. +1
    -1
      libavformat/aacdec.c
  16. +2
    -2
      libavformat/ac3dec.c
  17. +1
    -1
      libavformat/adtsenc.c
  18. +1
    -1
      libavformat/aea.c
  19. +1
    -1
      libavformat/aiffdec.c
  20. +1
    -1
      libavformat/aiffenc.c
  21. +6
    -6
      libavformat/allformats.c
  22. +2
    -2
      libavformat/amr.c
  23. +1
    -1
      libavformat/anm.c
  24. +1
    -1
      libavformat/apc.c
  25. +1
    -1
      libavformat/ape.c
  26. +1
    -1
      libavformat/applehttp.c
  27. +1
    -1
      libavformat/asf.h
  28. +1
    -1
      libavformat/asfdec.c
  29. +2
    -2
      libavformat/asfenc.c
  30. +1
    -1
      libavformat/assdec.c
  31. +1
    -1
      libavformat/assenc.c
  32. +2
    -2
      libavformat/au.c
  33. +1
    -1
      libavformat/avidec.c
  34. +1
    -1
      libavformat/avienc.c
  35. +1
    -1
      libavformat/avisynth.c
  36. +1
    -1
      libavformat/avs.c
  37. +1
    -1
      libavformat/bethsoftvid.c
  38. +1
    -1
      libavformat/bfi.c
  39. +1
    -1
      libavformat/bink.c
  40. +1
    -1
      libavformat/c93.c
  41. +1
    -1
      libavformat/cafdec.c
  42. +1
    -1
      libavformat/cavsvideodec.c
  43. +1
    -1
      libavformat/cdg.c
  44. +1
    -1
      libavformat/concat.c
  45. +1
    -1
      libavformat/crcenc.c
  46. +2
    -2
      libavformat/daud.c
  47. +1
    -1
      libavformat/diracdec.c
  48. +1
    -1
      libavformat/dnxhddec.c
  49. +1
    -1
      libavformat/dsicin.c
  50. +1
    -1
      libavformat/dtsdec.c
  51. +1
    -1
      libavformat/dv.c
  52. +1
    -1
      libavformat/dvenc.c
  53. +1
    -1
      libavformat/dxa.c
  54. +1
    -1
      libavformat/eacdata.c
  55. +1
    -1
      libavformat/electronicarts.c
  56. +1
    -1
      libavformat/ffmdec.c
  57. +1
    -1
      libavformat/ffmenc.c
  58. +1
    -1
      libavformat/ffmetadec.c
  59. +1
    -1
      libavformat/ffmetaenc.c
  60. +2
    -2
      libavformat/file.c
  61. +1
    -1
      libavformat/filmstripdec.c
  62. +1
    -1
      libavformat/filmstripenc.c
  63. +1
    -1
      libavformat/flacdec.c
  64. +1
    -1
      libavformat/flacenc.c
  65. +1
    -1
      libavformat/flic.c
  66. +1
    -1
      libavformat/flvdec.c
  67. +1
    -1
      libavformat/flvenc.c
  68. +1
    -1
      libavformat/framecrcenc.c
  69. +1
    -1
      libavformat/gif.c
  70. +1
    -1
      libavformat/gopher.c
  71. +1
    -1
      libavformat/gxf.c
  72. +1
    -1
      libavformat/gxfenc.c
  73. +1
    -1
      libavformat/h261dec.c
  74. +1
    -1
      libavformat/h263dec.c
  75. +1
    -1
      libavformat/h264dec.c
  76. +1
    -1
      libavformat/http.c
  77. +1
    -1
      libavformat/idcin.c
  78. +1
    -1
      libavformat/idroqdec.c
  79. +1
    -1
      libavformat/idroqenc.c
  80. +1
    -1
      libavformat/iff.c
  81. +4
    -4
      libavformat/img2.c
  82. +1
    -1
      libavformat/ingenientdec.c
  83. +1
    -1
      libavformat/ipmovie.c
  84. +1
    -1
      libavformat/iss.c
  85. +1
    -1
      libavformat/iv8.c
  86. +1
    -1
      libavformat/ivfdec.c
  87. +1
    -1
      libavformat/ivfenc.c
  88. +2
    -2
      libavformat/libnut.c
  89. +5
    -5
      libavformat/librtmp.c
  90. +1
    -1
      libavformat/lmlm4.c
  91. +1
    -1
      libavformat/lxfdec.c
  92. +1
    -1
      libavformat/m4vdec.c
  93. +1
    -1
      libavformat/matroskadec.c
  94. +3
    -3
      libavformat/matroskaenc.c
  95. +2
    -2
      libavformat/md5enc.c
  96. +1
    -1
      libavformat/md5proto.c
  97. +1
    -1
      libavformat/mm.c
  98. +2
    -2
      libavformat/mmf.c
  99. +1
    -1
      libavformat/mmsh.c
  100. +1
    -1
      libavformat/mmst.c

+ 4
- 4
libavdevice/alldevices.c View File

@@ -23,11 +23,11 @@
#include "avdevice.h" #include "avdevice.h"


#define REGISTER_OUTDEV(X,x) { \ #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) { \ #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) #define REGISTER_INOUTDEV(X,x) REGISTER_OUTDEV(X,x); REGISTER_INDEV(X,x)


void avdevice_register_all(void) void avdevice_register_all(void)


+ 1
- 1
libavdevice/alsa-audio-dec.c View File

@@ -163,7 +163,7 @@ static int audio_read_packet(AVFormatContext *s1, AVPacket *pkt)
return 0; return 0;
} }


AVInputFormat alsa_demuxer = {
AVInputFormat ff_alsa_demuxer = {
"alsa", "alsa",
NULL_IF_CONFIG_SMALL("ALSA audio input"), NULL_IF_CONFIG_SMALL("ALSA audio input"),
sizeof(AlsaData), sizeof(AlsaData),


+ 1
- 1
libavdevice/alsa-audio-enc.c View File

@@ -93,7 +93,7 @@ static int audio_write_packet(AVFormatContext *s1, AVPacket *pkt)
return 0; return 0;
} }


AVOutputFormat alsa_muxer = {
AVOutputFormat ff_alsa_muxer = {
"alsa", "alsa",
NULL_IF_CONFIG_SMALL("ALSA audio output"), NULL_IF_CONFIG_SMALL("ALSA audio output"),
"", "",


+ 1
- 1
libavdevice/bktr.c View File

@@ -314,7 +314,7 @@ static int grab_read_close(AVFormatContext *s1)
return 0; return 0;
} }


AVInputFormat bktr_demuxer = {
AVInputFormat ff_bktr_demuxer = {
"bktr", "bktr",
NULL_IF_CONFIG_SMALL("video grab"), NULL_IF_CONFIG_SMALL("video grab"),
sizeof(VideoData), sizeof(VideoData),


+ 1
- 1
libavdevice/dv1394.c View File

@@ -227,7 +227,7 @@ static int dv1394_close(AVFormatContext * context)
return 0; return 0;
} }


AVInputFormat dv1394_demuxer = {
AVInputFormat ff_dv1394_demuxer = {
.name = "dv1394", .name = "dv1394",
.long_name = NULL_IF_CONFIG_SMALL("DV1394 A/V grab"), .long_name = NULL_IF_CONFIG_SMALL("DV1394 A/V grab"),
.priv_data_size = sizeof(struct dv1394_data), .priv_data_size = sizeof(struct dv1394_data),


+ 1
- 1
libavdevice/jack_audio.c View File

@@ -314,7 +314,7 @@ static int audio_read_close(AVFormatContext *context)
return 0; return 0;
} }


AVInputFormat jack_demuxer = {
AVInputFormat ff_jack_demuxer = {
"jack", "jack",
NULL_IF_CONFIG_SMALL("JACK Audio Connection Kit"), NULL_IF_CONFIG_SMALL("JACK Audio Connection Kit"),
sizeof(JackData), sizeof(JackData),


+ 2
- 2
libavdevice/libdc1394.c View File

@@ -348,7 +348,7 @@ static int dc1394_v2_close(AVFormatContext * context)
return 0; return 0;
} }


AVInputFormat libdc1394_demuxer = {
AVInputFormat ff_libdc1394_demuxer = {
.name = "libdc1394", .name = "libdc1394",
.long_name = NULL_IF_CONFIG_SMALL("dc1394 v.2 A/V grab"), .long_name = NULL_IF_CONFIG_SMALL("dc1394 v.2 A/V grab"),
.priv_data_size = sizeof(struct dc1394_data), .priv_data_size = sizeof(struct dc1394_data),
@@ -360,7 +360,7 @@ AVInputFormat libdc1394_demuxer = {


#endif #endif
#if HAVE_LIBDC1394_1 #if HAVE_LIBDC1394_1
AVInputFormat libdc1394_demuxer = {
AVInputFormat ff_libdc1394_demuxer = {
.name = "libdc1394", .name = "libdc1394",
.long_name = NULL_IF_CONFIG_SMALL("dc1394 v.1 A/V grab"), .long_name = NULL_IF_CONFIG_SMALL("dc1394 v.1 A/V grab"),
.priv_data_size = sizeof(struct dc1394_data), .priv_data_size = sizeof(struct dc1394_data),


+ 2
- 2
libavdevice/oss_audio.c View File

@@ -293,7 +293,7 @@ static int audio_read_close(AVFormatContext *s1)
} }


#if CONFIG_OSS_INDEV #if CONFIG_OSS_INDEV
AVInputFormat oss_demuxer = {
AVInputFormat ff_oss_demuxer = {
"oss", "oss",
NULL_IF_CONFIG_SMALL("Open Sound System capture"), NULL_IF_CONFIG_SMALL("Open Sound System capture"),
sizeof(AudioData), sizeof(AudioData),
@@ -306,7 +306,7 @@ AVInputFormat oss_demuxer = {
#endif #endif


#if CONFIG_OSS_OUTDEV #if CONFIG_OSS_OUTDEV
AVOutputFormat oss_muxer = {
AVOutputFormat ff_oss_muxer = {
"oss", "oss",
NULL_IF_CONFIG_SMALL("Open Sound System playback"), NULL_IF_CONFIG_SMALL("Open Sound System playback"),
"", "",


+ 1
- 1
libavdevice/v4l.c View File

@@ -339,7 +339,7 @@ static int grab_read_close(AVFormatContext *s1)
return 0; return 0;
} }


AVInputFormat v4l_demuxer = {
AVInputFormat ff_v4l_demuxer = {
"video4linux", "video4linux",
NULL_IF_CONFIG_SMALL("Video4Linux device grab"), NULL_IF_CONFIG_SMALL("Video4Linux device grab"),
sizeof(VideoData), sizeof(VideoData),


+ 1
- 1
libavdevice/v4l2.c View File

@@ -680,7 +680,7 @@ static int v4l2_read_close(AVFormatContext *s1)
return 0; return 0;
} }


AVInputFormat v4l2_demuxer = {
AVInputFormat ff_v4l2_demuxer = {
"video4linux2", "video4linux2",
NULL_IF_CONFIG_SMALL("Video4Linux2 device grab"), NULL_IF_CONFIG_SMALL("Video4Linux2 device grab"),
sizeof(struct video_data), sizeof(struct video_data),


+ 1
- 1
libavdevice/vfwcap.c View File

@@ -452,7 +452,7 @@ static int vfw_read_packet(AVFormatContext *s, AVPacket *pkt)
return pkt->size; return pkt->size;
} }


AVInputFormat vfwcap_demuxer = {
AVInputFormat ff_vfwcap_demuxer = {
"vfwcap", "vfwcap",
NULL_IF_CONFIG_SMALL("VFW video capture"), NULL_IF_CONFIG_SMALL("VFW video capture"),
sizeof(struct vfw_ctx), sizeof(struct vfw_ctx),


+ 1
- 1
libavdevice/x11grab.c View File

@@ -442,7 +442,7 @@ x11grab_read_close(AVFormatContext *s1)
} }


/** x11 grabber device demuxer declaration */ /** x11 grabber device demuxer declaration */
AVInputFormat x11_grab_device_demuxer =
AVInputFormat ff_x11_grab_device_demuxer =
{ {
"x11grab", "x11grab",
NULL_IF_CONFIG_SMALL("X11grab"), NULL_IF_CONFIG_SMALL("X11grab"),


+ 1
- 1
libavformat/4xm.c View File

@@ -343,7 +343,7 @@ static int fourxm_read_close(AVFormatContext *s)
return 0; return 0;
} }


AVInputFormat fourxm_demuxer = {
AVInputFormat ff_fourxm_demuxer = {
"4xm", "4xm",
NULL_IF_CONFIG_SMALL("4X Technologies format"), NULL_IF_CONFIG_SMALL("4X Technologies format"),
sizeof(FourxmDemuxContext), sizeof(FourxmDemuxContext),


+ 1
- 1
libavformat/a64.c View File

@@ -164,7 +164,7 @@ static int a64_write_trailer(struct AVFormatContext *s)
return 0; return 0;
} }


AVOutputFormat a64_muxer = {
AVOutputFormat ff_a64_muxer = {
.name = "a64", .name = "a64",
.long_name = NULL_IF_CONFIG_SMALL("a64 - video for Commodore 64"), .long_name = NULL_IF_CONFIG_SMALL("a64 - video for Commodore 64"),
.mime_type = NULL, .mime_type = NULL,


+ 1
- 1
libavformat/aacdec.c View File

@@ -81,7 +81,7 @@ static int adts_aac_read_header(AVFormatContext *s,
return 0; return 0;
} }


AVInputFormat aac_demuxer = {
AVInputFormat ff_aac_demuxer = {
"aac", "aac",
NULL_IF_CONFIG_SMALL("raw ADTS AAC"), NULL_IF_CONFIG_SMALL("raw ADTS AAC"),
0, 0,


+ 2
- 2
libavformat/ac3dec.c View File

@@ -70,7 +70,7 @@ static int ac3_probe(AVProbeData *p)
return ac3_eac3_probe(p, CODEC_ID_AC3); return ac3_eac3_probe(p, CODEC_ID_AC3);
} }


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


AVInputFormat eac3_demuxer = {
AVInputFormat ff_eac3_demuxer = {
"eac3", "eac3",
NULL_IF_CONFIG_SMALL("raw E-AC-3"), NULL_IF_CONFIG_SMALL("raw E-AC-3"),
0, 0,


+ 1
- 1
libavformat/adtsenc.c View File

@@ -137,7 +137,7 @@ static int adts_write_packet(AVFormatContext *s, AVPacket *pkt)
return 0; return 0;
} }


AVOutputFormat adts_muxer = {
AVOutputFormat ff_adts_muxer = {
"adts", "adts",
NULL_IF_CONFIG_SMALL("ADTS AAC"), NULL_IF_CONFIG_SMALL("ADTS AAC"),
"audio/aac", "audio/aac",


+ 1
- 1
libavformat/aea.c View File

@@ -93,7 +93,7 @@ static int aea_read_packet(AVFormatContext *s, AVPacket *pkt)
return ret; return ret;
} }


AVInputFormat aea_demuxer = {
AVInputFormat ff_aea_demuxer = {
"aea", "aea",
NULL_IF_CONFIG_SMALL("MD STUDIO audio"), NULL_IF_CONFIG_SMALL("MD STUDIO audio"),
0, 0,


+ 1
- 1
libavformat/aiffdec.c View File

@@ -311,7 +311,7 @@ static int aiff_read_packet(AVFormatContext *s,
return 0; return 0;
} }


AVInputFormat aiff_demuxer = {
AVInputFormat ff_aiff_demuxer = {
"aiff", "aiff",
NULL_IF_CONFIG_SMALL("Audio IFF"), NULL_IF_CONFIG_SMALL("Audio IFF"),
sizeof(AIFFInputContext), sizeof(AIFFInputContext),


+ 1
- 1
libavformat/aiffenc.c View File

@@ -145,7 +145,7 @@ static int aiff_write_trailer(AVFormatContext *s)
return 0; return 0;
} }


AVOutputFormat aiff_muxer = {
AVOutputFormat ff_aiff_muxer = {
"aiff", "aiff",
NULL_IF_CONFIG_SMALL("Audio IFF"), NULL_IF_CONFIG_SMALL("Audio IFF"),
"audio/aiff", "audio/aiff",


+ 6
- 6
libavformat/allformats.c View File

@@ -23,18 +23,18 @@
#include "rdt.h" #include "rdt.h"


#define REGISTER_MUXER(X,x) { \ #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) { \ #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_MUXDEMUX(X,x) REGISTER_MUXER(X,x); REGISTER_DEMUXER(X,x)


#define REGISTER_PROTOCOL(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) void av_register_all(void)
{ {


+ 2
- 2
libavformat/amr.c View File

@@ -169,7 +169,7 @@ static int amr_read_packet(AVFormatContext *s,
} }


#if CONFIG_AMR_DEMUXER #if CONFIG_AMR_DEMUXER
AVInputFormat amr_demuxer = {
AVInputFormat ff_amr_demuxer = {
"amr", "amr",
NULL_IF_CONFIG_SMALL("3GPP AMR file format"), NULL_IF_CONFIG_SMALL("3GPP AMR file format"),
0, /*priv_data_size*/ 0, /*priv_data_size*/
@@ -181,7 +181,7 @@ AVInputFormat amr_demuxer = {
#endif #endif


#if CONFIG_AMR_MUXER #if CONFIG_AMR_MUXER
AVOutputFormat amr_muxer = {
AVOutputFormat ff_amr_muxer = {
"amr", "amr",
NULL_IF_CONFIG_SMALL("3GPP AMR file format"), NULL_IF_CONFIG_SMALL("3GPP AMR file format"),
"audio/amr", "audio/amr",


+ 1
- 1
libavformat/anm.c View File

@@ -225,7 +225,7 @@ repeat:
return 0; return 0;
} }


AVInputFormat anm_demuxer = {
AVInputFormat ff_anm_demuxer = {
"anm", "anm",
NULL_IF_CONFIG_SMALL("Deluxe Paint Animation"), NULL_IF_CONFIG_SMALL("Deluxe Paint Animation"),
sizeof(AnmDemuxContext), sizeof(AnmDemuxContext),


+ 1
- 1
libavformat/apc.c View File

@@ -80,7 +80,7 @@ static int apc_read_packet(AVFormatContext *s, AVPacket *pkt)
return 0; return 0;
} }


AVInputFormat apc_demuxer = {
AVInputFormat ff_apc_demuxer = {
"apc", "apc",
NULL_IF_CONFIG_SMALL("CRYO APC format"), NULL_IF_CONFIG_SMALL("CRYO APC format"),
0, 0,


+ 1
- 1
libavformat/ape.c View File

@@ -391,7 +391,7 @@ static int ape_read_seek(AVFormatContext *s, int stream_index, int64_t timestamp
return 0; return 0;
} }


AVInputFormat ape_demuxer = {
AVInputFormat ff_ape_demuxer = {
"ape", "ape",
NULL_IF_CONFIG_SMALL("Monkey's Audio"), NULL_IF_CONFIG_SMALL("Monkey's Audio"),
sizeof(APEContext), sizeof(APEContext),


+ 1
- 1
libavformat/applehttp.c View File

@@ -579,7 +579,7 @@ static int applehttp_probe(AVProbeData *p)
return 0; return 0;
} }


AVInputFormat applehttp_demuxer = {
AVInputFormat ff_applehttp_demuxer = {
"applehttp", "applehttp",
NULL_IF_CONFIG_SMALL("Apple HTTP Live Streaming format"), NULL_IF_CONFIG_SMALL("Apple HTTP Live Streaming format"),
sizeof(AppleHTTPContext), sizeof(AppleHTTPContext),


+ 1
- 1
libavformat/asf.h View File

@@ -229,7 +229,7 @@ extern const AVMetadataConv ff_asf_metadata_conv[];


#define ASF_PL_FLAG_KEY_FRAME 0x80 //1000 0000 #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); int ff_guidcmp(const void *g1, const void *g2);
void ff_get_guid(ByteIOContext *s, ff_asf_guid *g); void ff_get_guid(ByteIOContext *s, ff_asf_guid *g);




+ 1
- 1
libavformat/asfdec.c View File

@@ -1203,7 +1203,7 @@ static int asf_read_seek(AVFormatContext *s, int stream_index, int64_t pts, int
return 0; return 0;
} }


AVInputFormat asf_demuxer = {
AVInputFormat ff_asf_demuxer = {
"asf", "asf",
NULL_IF_CONFIG_SMALL("ASF format"), NULL_IF_CONFIG_SMALL("ASF format"),
sizeof(ASFContext), sizeof(ASFContext),


+ 2
- 2
libavformat/asfenc.c View File

@@ -855,7 +855,7 @@ static int asf_write_trailer(AVFormatContext *s)
} }


#if CONFIG_ASF_MUXER #if CONFIG_ASF_MUXER
AVOutputFormat asf_muxer = {
AVOutputFormat ff_asf_muxer = {
"asf", "asf",
NULL_IF_CONFIG_SMALL("ASF format"), NULL_IF_CONFIG_SMALL("ASF format"),
"video/x-ms-asf", "video/x-ms-asf",
@@ -876,7 +876,7 @@ AVOutputFormat asf_muxer = {
#endif #endif


#if CONFIG_ASF_STREAM_MUXER #if CONFIG_ASF_STREAM_MUXER
AVOutputFormat asf_stream_muxer = {
AVOutputFormat ff_asf_stream_muxer = {
"asf_stream", "asf_stream",
NULL_IF_CONFIG_SMALL("ASF format"), NULL_IF_CONFIG_SMALL("ASF format"),
"video/x-ms-asf", "video/x-ms-asf",


+ 1
- 1
libavformat/assdec.c View File

@@ -202,7 +202,7 @@ static int read_seek2(AVFormatContext *s, int stream_index,
return 0; return 0;
} }


AVInputFormat ass_demuxer = {
AVInputFormat ff_ass_demuxer = {
.name = "ass", .name = "ass",
.long_name = NULL_IF_CONFIG_SMALL("Advanced SubStation Alpha subtitle format"), .long_name = NULL_IF_CONFIG_SMALL("Advanced SubStation Alpha subtitle format"),
.priv_data_size = sizeof(ASSContext), .priv_data_size = sizeof(ASSContext),


+ 1
- 1
libavformat/assenc.c View File

@@ -77,7 +77,7 @@ static int write_trailer(AVFormatContext *s)
return 0; return 0;
} }


AVOutputFormat ass_muxer = {
AVOutputFormat ff_ass_muxer = {
.name = "ass", .name = "ass",
.long_name = NULL_IF_CONFIG_SMALL("Advanced SubStation Alpha subtitle format"), .long_name = NULL_IF_CONFIG_SMALL("Advanced SubStation Alpha subtitle format"),
.mime_type = "text/x-ssa", .mime_type = "text/x-ssa",


+ 2
- 2
libavformat/au.c View File

@@ -183,7 +183,7 @@ static int au_read_packet(AVFormatContext *s,
} }


#if CONFIG_AU_DEMUXER #if CONFIG_AU_DEMUXER
AVInputFormat au_demuxer = {
AVInputFormat ff_au_demuxer = {
"au", "au",
NULL_IF_CONFIG_SMALL("SUN AU format"), NULL_IF_CONFIG_SMALL("SUN AU format"),
0, 0,
@@ -197,7 +197,7 @@ AVInputFormat au_demuxer = {
#endif #endif


#if CONFIG_AU_MUXER #if CONFIG_AU_MUXER
AVOutputFormat au_muxer = {
AVOutputFormat ff_au_muxer = {
"au", "au",
NULL_IF_CONFIG_SMALL("SUN AU format"), NULL_IF_CONFIG_SMALL("SUN AU format"),
"audio/basic", "audio/basic",


+ 1
- 1
libavformat/avidec.c View File

@@ -1373,7 +1373,7 @@ static int avi_probe(AVProbeData *p)
return 0; return 0;
} }


AVInputFormat avi_demuxer = {
AVInputFormat ff_avi_demuxer = {
"avi", "avi",
NULL_IF_CONFIG_SMALL("AVI format"), NULL_IF_CONFIG_SMALL("AVI format"),
sizeof(AVIContext), sizeof(AVIContext),


+ 1
- 1
libavformat/avienc.c View File

@@ -630,7 +630,7 @@ static int avi_write_trailer(AVFormatContext *s)
return res; return res;
} }


AVOutputFormat avi_muxer = {
AVOutputFormat ff_avi_muxer = {
"avi", "avi",
NULL_IF_CONFIG_SMALL("AVI format"), NULL_IF_CONFIG_SMALL("AVI format"),
"video/x-msvideo", "video/x-msvideo",


+ 1
- 1
libavformat/avisynth.c View File

@@ -207,7 +207,7 @@ static int avisynth_read_seek(AVFormatContext *s, int stream_index, int64_t pts,
return 0; return 0;
} }


AVInputFormat avisynth_demuxer = {
AVInputFormat ff_avisynth_demuxer = {
"avs", "avs",
NULL_IF_CONFIG_SMALL("AVISynth"), NULL_IF_CONFIG_SMALL("AVISynth"),
sizeof(AVISynthContext), sizeof(AVISynthContext),


+ 1
- 1
libavformat/avs.c View File

@@ -215,7 +215,7 @@ static int avs_read_close(AVFormatContext * s)
return 0; return 0;
} }


AVInputFormat avs_demuxer = {
AVInputFormat ff_avs_demuxer = {
"avs", "avs",
NULL_IF_CONFIG_SMALL("AVS format"), NULL_IF_CONFIG_SMALL("AVS format"),
sizeof(AvsFormat), sizeof(AvsFormat),


+ 1
- 1
libavformat/bethsoftvid.c View File

@@ -224,7 +224,7 @@ static int vid_read_packet(AVFormatContext *s,
return 0; return 0;
} }


AVInputFormat bethsoftvid_demuxer = {
AVInputFormat ff_bethsoftvid_demuxer = {
"bethsoftvid", "bethsoftvid",
NULL_IF_CONFIG_SMALL("Bethesda Softworks VID format"), NULL_IF_CONFIG_SMALL("Bethesda Softworks VID format"),
sizeof(BVID_DemuxContext), sizeof(BVID_DemuxContext),


+ 1
- 1
libavformat/bfi.c View File

@@ -158,7 +158,7 @@ static int bfi_read_packet(AVFormatContext * s, AVPacket * pkt)
return ret; return ret;
} }


AVInputFormat bfi_demuxer = {
AVInputFormat ff_bfi_demuxer = {
"bfi", "bfi",
NULL_IF_CONFIG_SMALL("Brute Force & Ignorance"), NULL_IF_CONFIG_SMALL("Brute Force & Ignorance"),
sizeof(BFIContext), sizeof(BFIContext),


+ 1
- 1
libavformat/bink.c View File

@@ -257,7 +257,7 @@ static int read_seek(AVFormatContext *s, int stream_index, int64_t timestamp, in
return 0; return 0;
} }


AVInputFormat bink_demuxer = {
AVInputFormat ff_bink_demuxer = {
"bink", "bink",
NULL_IF_CONFIG_SMALL("Bink"), NULL_IF_CONFIG_SMALL("Bink"),
sizeof(BinkDemuxContext), sizeof(BinkDemuxContext),


+ 1
- 1
libavformat/c93.c View File

@@ -192,7 +192,7 @@ static int read_packet(AVFormatContext *s, AVPacket *pkt)
return ret; return ret;
} }


AVInputFormat c93_demuxer = {
AVInputFormat ff_c93_demuxer = {
"c93", "c93",
NULL_IF_CONFIG_SMALL("Interplay C93"), NULL_IF_CONFIG_SMALL("Interplay C93"),
sizeof(C93DemuxContext), sizeof(C93DemuxContext),


+ 1
- 1
libavformat/cafdec.c View File

@@ -381,7 +381,7 @@ static int read_seek(AVFormatContext *s, int stream_index,
return 0; return 0;
} }


AVInputFormat caf_demuxer = {
AVInputFormat ff_caf_demuxer = {
"caf", "caf",
NULL_IF_CONFIG_SMALL("Apple Core Audio Format"), NULL_IF_CONFIG_SMALL("Apple Core Audio Format"),
sizeof(CaffContext), sizeof(CaffContext),


+ 1
- 1
libavformat/cavsvideodec.c View File

@@ -65,7 +65,7 @@ static int cavsvideo_probe(AVProbeData *p)
return 0; return 0;
} }


AVInputFormat cavsvideo_demuxer = {
AVInputFormat ff_cavsvideo_demuxer = {
"cavsvideo", "cavsvideo",
NULL_IF_CONFIG_SMALL("raw Chinese AVS video"), NULL_IF_CONFIG_SMALL("raw Chinese AVS video"),
0, 0,


+ 1
- 1
libavformat/cdg.c View File

@@ -55,7 +55,7 @@ static int read_packet(AVFormatContext *s, AVPacket *pkt)
return ret; return ret;
} }


AVInputFormat cdg_demuxer = {
AVInputFormat ff_cdg_demuxer = {
"cdg", "cdg",
NULL_IF_CONFIG_SMALL("CD Graphics Format"), NULL_IF_CONFIG_SMALL("CD Graphics Format"),
0, 0,


+ 1
- 1
libavformat/concat.c View File

@@ -188,7 +188,7 @@ static int64_t concat_seek(URLContext *h, int64_t pos, int whence)
return result; return result;
} }


URLProtocol concat_protocol = {
URLProtocol ff_concat_protocol = {
"concat", "concat",
concat_open, concat_open,
concat_read, concat_read,


+ 1
- 1
libavformat/crcenc.c View File

@@ -54,7 +54,7 @@ static int crc_write_trailer(struct AVFormatContext *s)
return 0; return 0;
} }


AVOutputFormat crc_muxer = {
AVOutputFormat ff_crc_muxer = {
"crc", "crc",
NULL_IF_CONFIG_SMALL("CRC testing format"), NULL_IF_CONFIG_SMALL("CRC testing format"),
NULL, NULL,


+ 2
- 2
libavformat/daud.c View File

@@ -65,7 +65,7 @@ static int daud_write_packet(struct AVFormatContext *s, AVPacket *pkt)
} }


#if CONFIG_DAUD_DEMUXER #if CONFIG_DAUD_DEMUXER
AVInputFormat daud_demuxer = {
AVInputFormat ff_daud_demuxer = {
"daud", "daud",
NULL_IF_CONFIG_SMALL("D-Cinema audio format"), NULL_IF_CONFIG_SMALL("D-Cinema audio format"),
0, 0,
@@ -79,7 +79,7 @@ AVInputFormat daud_demuxer = {
#endif #endif


#if CONFIG_DAUD_MUXER #if CONFIG_DAUD_MUXER
AVOutputFormat daud_muxer =
AVOutputFormat ff_daud_muxer =
{ {
"daud", "daud",
NULL_IF_CONFIG_SMALL("D-Cinema audio format"), NULL_IF_CONFIG_SMALL("D-Cinema audio format"),


+ 1
- 1
libavformat/diracdec.c View File

@@ -31,7 +31,7 @@ static int dirac_probe(AVProbeData *p)
return 0; return 0;
} }


AVInputFormat dirac_demuxer = {
AVInputFormat ff_dirac_demuxer = {
"dirac", "dirac",
NULL_IF_CONFIG_SMALL("raw Dirac"), NULL_IF_CONFIG_SMALL("raw Dirac"),
0, 0,


+ 1
- 1
libavformat/dnxhddec.c View File

@@ -42,7 +42,7 @@ static int dnxhd_probe(AVProbeData *p)
return AVPROBE_SCORE_MAX; return AVPROBE_SCORE_MAX;
} }


AVInputFormat dnxhd_demuxer = {
AVInputFormat ff_dnxhd_demuxer = {
"dnxhd", "dnxhd",
NULL_IF_CONFIG_SMALL("raw DNxHD (SMPTE VC-3)"), NULL_IF_CONFIG_SMALL("raw DNxHD (SMPTE VC-3)"),
0, 0,


+ 1
- 1
libavformat/dsicin.c View File

@@ -216,7 +216,7 @@ static int cin_read_packet(AVFormatContext *s, AVPacket *pkt)
return 0; return 0;
} }


AVInputFormat dsicin_demuxer = {
AVInputFormat ff_dsicin_demuxer = {
"dsicin", "dsicin",
NULL_IF_CONFIG_SMALL("Delphine Software International CIN format"), NULL_IF_CONFIG_SMALL("Delphine Software International CIN format"),
sizeof(CinDemuxContext), sizeof(CinDemuxContext),


+ 1
- 1
libavformat/dtsdec.c View File

@@ -65,7 +65,7 @@ static int dts_probe(AVProbeData *p)
return 0; return 0;
} }


AVInputFormat dts_demuxer = {
AVInputFormat ff_dts_demuxer = {
"dts", "dts",
NULL_IF_CONFIG_SMALL("raw DTS"), NULL_IF_CONFIG_SMALL("raw DTS"),
0, 0,


+ 1
- 1
libavformat/dv.c View File

@@ -518,7 +518,7 @@ static int dv_probe(AVProbeData *p)
} }


#if CONFIG_DV_DEMUXER #if CONFIG_DV_DEMUXER
AVInputFormat dv_demuxer = {
AVInputFormat ff_dv_demuxer = {
"dv", "dv",
NULL_IF_CONFIG_SMALL("DV video format"), NULL_IF_CONFIG_SMALL("DV video format"),
sizeof(RawDVContext), sizeof(RawDVContext),


+ 1
- 1
libavformat/dvenc.c View File

@@ -399,7 +399,7 @@ static int dv_write_trailer(struct AVFormatContext *s)
return 0; return 0;
} }


AVOutputFormat dv_muxer = {
AVOutputFormat ff_dv_muxer = {
"dv", "dv",
NULL_IF_CONFIG_SMALL("DV video format"), NULL_IF_CONFIG_SMALL("DV video format"),
NULL, NULL,


+ 1
- 1
libavformat/dxa.c View File

@@ -209,7 +209,7 @@ static int dxa_read_packet(AVFormatContext *s, AVPacket *pkt)
return AVERROR(EIO); return AVERROR(EIO);
} }


AVInputFormat dxa_demuxer = {
AVInputFormat ff_dxa_demuxer = {
"dxa", "dxa",
NULL_IF_CONFIG_SMALL("DXA"), NULL_IF_CONFIG_SMALL("DXA"),
sizeof(DXAContext), sizeof(DXAContext),


+ 1
- 1
libavformat/eacdata.c View File

@@ -90,7 +90,7 @@ static int cdata_read_packet(AVFormatContext *s, AVPacket *pkt)
return 0; return 0;
} }


AVInputFormat ea_cdata_demuxer = {
AVInputFormat ff_ea_cdata_demuxer = {
"ea_cdata", "ea_cdata",
NULL_IF_CONFIG_SMALL("Electronic Arts cdata"), NULL_IF_CONFIG_SMALL("Electronic Arts cdata"),
sizeof(CdataDemuxContext), sizeof(CdataDemuxContext),


+ 1
- 1
libavformat/electronicarts.c View File

@@ -568,7 +568,7 @@ get_video_packet:
return ret; return ret;
} }


AVInputFormat ea_demuxer = {
AVInputFormat ff_ea_demuxer = {
"ea", "ea",
NULL_IF_CONFIG_SMALL("Electronic Arts Multimedia Format"), NULL_IF_CONFIG_SMALL("Electronic Arts Multimedia Format"),
sizeof(EaDemuxContext), sizeof(EaDemuxContext),


+ 1
- 1
libavformat/ffmdec.c View File

@@ -518,7 +518,7 @@ static int ffm_probe(AVProbeData *p)
return 0; return 0;
} }


AVInputFormat ffm_demuxer = {
AVInputFormat ff_ffm_demuxer = {
"ffm", "ffm",
NULL_IF_CONFIG_SMALL("FFM (FFserver live feed) format"), NULL_IF_CONFIG_SMALL("FFM (FFserver live feed) format"),
sizeof(FFMContext), sizeof(FFMContext),


+ 1
- 1
libavformat/ffmenc.c View File

@@ -240,7 +240,7 @@ static int ffm_write_trailer(AVFormatContext *s)
return 0; return 0;
} }


AVOutputFormat ffm_muxer = {
AVOutputFormat ff_ffm_muxer = {
"ffm", "ffm",
NULL_IF_CONFIG_SMALL("FFM (FFserver live feed) format"), NULL_IF_CONFIG_SMALL("FFM (FFserver live feed) format"),
"", "",


+ 1
- 1
libavformat/ffmetadec.c View File

@@ -163,7 +163,7 @@ static int read_packet(AVFormatContext *s, AVPacket *pkt)
return AVERROR_EOF; return AVERROR_EOF;
} }


AVInputFormat ffmetadata_demuxer = {
AVInputFormat ff_ffmetadata_demuxer = {
.name = "ffmetadata", .name = "ffmetadata",
.long_name = NULL_IF_CONFIG_SMALL("FFmpeg metadata in text format"), .long_name = NULL_IF_CONFIG_SMALL("FFmpeg metadata in text format"),
.read_probe = probe, .read_probe = probe,


+ 1
- 1
libavformat/ffmetaenc.c View File

@@ -89,7 +89,7 @@ static int write_packet(AVFormatContext *s, AVPacket *pkt)
return 0; return 0;
} }


AVOutputFormat ffmetadata_muxer = {
AVOutputFormat ff_ffmetadata_muxer = {
.name = "ffmetadata", .name = "ffmetadata",
.long_name = NULL_IF_CONFIG_SMALL("FFmpeg metadata in text format"), .long_name = NULL_IF_CONFIG_SMALL("FFmpeg metadata in text format"),
.extensions = "ffmeta", .extensions = "ffmeta",


+ 2
- 2
libavformat/file.c View File

@@ -94,7 +94,7 @@ static int file_close(URLContext *h)
return close(fd); return close(fd);
} }


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


URLProtocol pipe_protocol = {
URLProtocol ff_pipe_protocol = {
"pipe", "pipe",
pipe_open, pipe_open,
file_read, file_read,


+ 1
- 1
libavformat/filmstripdec.c View File

@@ -98,7 +98,7 @@ static int read_seek(AVFormatContext *s, int stream_index, int64_t timestamp, in
return 0; return 0;
} }


AVInputFormat filmstrip_demuxer = {
AVInputFormat ff_filmstrip_demuxer = {
"filmstrip", "filmstrip",
NULL_IF_CONFIG_SMALL("Adobe Filmstrip"), NULL_IF_CONFIG_SMALL("Adobe Filmstrip"),
sizeof(FilmstripDemuxContext), sizeof(FilmstripDemuxContext),


+ 1
- 1
libavformat/filmstripenc.c View File

@@ -71,7 +71,7 @@ static int write_trailer(AVFormatContext *s)
return 0; return 0;
} }


AVOutputFormat filmstrip_muxer = {
AVOutputFormat ff_filmstrip_muxer = {
"filmstrip", "filmstrip",
NULL_IF_CONFIG_SMALL("Adobe Filmstrip"), NULL_IF_CONFIG_SMALL("Adobe Filmstrip"),
NULL, NULL,


+ 1
- 1
libavformat/flacdec.c View File

@@ -123,7 +123,7 @@ static int flac_probe(AVProbeData *p)
else return AVPROBE_SCORE_MAX/2; else return AVPROBE_SCORE_MAX/2;
} }


AVInputFormat flac_demuxer = {
AVInputFormat ff_flac_demuxer = {
"flac", "flac",
NULL_IF_CONFIG_SMALL("raw FLAC"), NULL_IF_CONFIG_SMALL("raw FLAC"),
0, 0,


+ 1
- 1
libavformat/flacenc.c View File

@@ -118,7 +118,7 @@ static int flac_write_packet(struct AVFormatContext *s, AVPacket *pkt)
return 0; return 0;
} }


AVOutputFormat flac_muxer = {
AVOutputFormat ff_flac_muxer = {
"flac", "flac",
NULL_IF_CONFIG_SMALL("raw FLAC"), NULL_IF_CONFIG_SMALL("raw FLAC"),
"audio/x-flac", "audio/x-flac",


+ 1
- 1
libavformat/flic.c View File

@@ -259,7 +259,7 @@ static int flic_read_packet(AVFormatContext *s,
return ret; return ret;
} }


AVInputFormat flic_demuxer = {
AVInputFormat ff_flic_demuxer = {
"flic", "flic",
NULL_IF_CONFIG_SMALL("FLI/FLC/FLX animation format"), NULL_IF_CONFIG_SMALL("FLI/FLC/FLX animation format"),
sizeof(FlicDemuxContext), sizeof(FlicDemuxContext),


+ 1
- 1
libavformat/flvdec.c View File

@@ -491,7 +491,7 @@ static int flv_read_seek2(AVFormatContext *s, int stream_index,
} }
#endif #endif


AVInputFormat flv_demuxer = {
AVInputFormat ff_flv_demuxer = {
"flv", "flv",
NULL_IF_CONFIG_SMALL("FLV format"), NULL_IF_CONFIG_SMALL("FLV format"),
sizeof(FLVContext), sizeof(FLVContext),


+ 1
- 1
libavformat/flvenc.c View File

@@ -437,7 +437,7 @@ static int flv_write_packet(AVFormatContext *s, AVPacket *pkt)
return 0; return 0;
} }


AVOutputFormat flv_muxer = {
AVOutputFormat ff_flv_muxer = {
"flv", "flv",
NULL_IF_CONFIG_SMALL("FLV format"), NULL_IF_CONFIG_SMALL("FLV format"),
"video/x-flv", "video/x-flv",


+ 1
- 1
libavformat/framecrcenc.c View File

@@ -33,7 +33,7 @@ static int framecrc_write_packet(struct AVFormatContext *s, AVPacket *pkt)
return 0; return 0;
} }


AVOutputFormat framecrc_muxer = {
AVOutputFormat ff_framecrc_muxer = {
"framecrc", "framecrc",
NULL_IF_CONFIG_SMALL("framecrc testing format"), NULL_IF_CONFIG_SMALL("framecrc testing format"),
NULL, NULL,


+ 1
- 1
libavformat/gif.c View File

@@ -344,7 +344,7 @@ static int gif_write_trailer(AVFormatContext *s)
return 0; return 0;
} }


AVOutputFormat gif_muxer = {
AVOutputFormat ff_gif_muxer = {
"gif", "gif",
NULL_IF_CONFIG_SMALL("GIF Animation"), NULL_IF_CONFIG_SMALL("GIF Animation"),
"image/gif", "image/gif",


+ 1
- 1
libavformat/gopher.c 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",
gopher_open, gopher_open,
gopher_read, gopher_read,


+ 1
- 1
libavformat/gxf.c View File

@@ -515,7 +515,7 @@ static int64_t gxf_read_timestamp(AVFormatContext *s, int stream_index,
return res; return res;
} }


AVInputFormat gxf_demuxer = {
AVInputFormat ff_gxf_demuxer = {
"gxf", "gxf",
NULL_IF_CONFIG_SMALL("GXF format"), NULL_IF_CONFIG_SMALL("GXF format"),
0, 0,


+ 1
- 1
libavformat/gxfenc.c 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); av_interleave_packet_per_dts, gxf_compare_field_nb);
} }


AVOutputFormat gxf_muxer = {
AVOutputFormat ff_gxf_muxer = {
"gxf", "gxf",
NULL_IF_CONFIG_SMALL("GXF format"), NULL_IF_CONFIG_SMALL("GXF format"),
NULL, NULL,


+ 1
- 1
libavformat/h261dec.c View File

@@ -62,7 +62,7 @@ static int h261_probe(AVProbeData *p)
return 0; return 0;
} }


AVInputFormat h261_demuxer = {
AVInputFormat ff_h261_demuxer = {
"h261", "h261",
NULL_IF_CONFIG_SMALL("raw H.261"), NULL_IF_CONFIG_SMALL("raw H.261"),
0, 0,


+ 1
- 1
libavformat/h263dec.c View File

@@ -64,7 +64,7 @@ static int h263_probe(AVProbeData *p)
return 0; return 0;
} }


AVInputFormat h263_demuxer = {
AVInputFormat ff_h263_demuxer = {
"h263", "h263",
NULL_IF_CONFIG_SMALL("raw H.263"), NULL_IF_CONFIG_SMALL("raw H.263"),
0, 0,


+ 1
- 1
libavformat/h264dec.c View File

@@ -67,7 +67,7 @@ static int h264_probe(AVProbeData *p)
return 0; return 0;
} }


AVInputFormat h264_demuxer = {
AVInputFormat ff_h264_demuxer = {
"h264", "h264",
NULL_IF_CONFIG_SMALL("raw H.264 video format"), NULL_IF_CONFIG_SMALL("raw H.264 video format"),
0, 0,


+ 1
- 1
libavformat/http.c View File

@@ -503,7 +503,7 @@ http_get_file_handle(URLContext *h)
return url_get_file_handle(s->hd); return url_get_file_handle(s->hd);
} }


URLProtocol http_protocol = {
URLProtocol ff_http_protocol = {
"http", "http",
http_open, http_open,
http_read, http_read,


+ 1
- 1
libavformat/idcin.c View File

@@ -286,7 +286,7 @@ static int idcin_read_packet(AVFormatContext *s,
return ret; return ret;
} }


AVInputFormat idcin_demuxer = {
AVInputFormat ff_idcin_demuxer = {
"idcin", "idcin",
NULL_IF_CONFIG_SMALL("id Cinematic format"), NULL_IF_CONFIG_SMALL("id Cinematic format"),
sizeof(IdcinDemuxContext), sizeof(IdcinDemuxContext),


+ 1
- 1
libavformat/idroqdec.c View File

@@ -216,7 +216,7 @@ static int roq_read_packet(AVFormatContext *s,
return ret; return ret;
} }


AVInputFormat roq_demuxer = {
AVInputFormat ff_roq_demuxer = {
"RoQ", "RoQ",
NULL_IF_CONFIG_SMALL("id RoQ format"), NULL_IF_CONFIG_SMALL("id RoQ format"),
sizeof(RoqDemuxContext), sizeof(RoqDemuxContext),


+ 1
- 1
libavformat/idroqenc.c View File

@@ -35,7 +35,7 @@ static int roq_write_header(struct AVFormatContext *s)
return 0; return 0;
} }


AVOutputFormat roq_muxer =
AVOutputFormat ff_roq_muxer =
{ {
"RoQ", "RoQ",
NULL_IF_CONFIG_SMALL("raw id RoQ format"), NULL_IF_CONFIG_SMALL("raw id RoQ format"),


+ 1
- 1
libavformat/iff.c View File

@@ -314,7 +314,7 @@ static int iff_read_packet(AVFormatContext *s,
return ret; return ret;
} }


AVInputFormat iff_demuxer = {
AVInputFormat ff_iff_demuxer = {
"IFF", "IFF",
NULL_IF_CONFIG_SMALL("IFF format"), NULL_IF_CONFIG_SMALL("IFF format"),
sizeof(IffDemuxContext), sizeof(IffDemuxContext),


+ 4
- 4
libavformat/img2.c View File

@@ -412,7 +412,7 @@ static int write_packet(AVFormatContext *s, AVPacket *pkt)


/* input */ /* input */
#if CONFIG_IMAGE2_DEMUXER #if CONFIG_IMAGE2_DEMUXER
AVInputFormat image2_demuxer = {
AVInputFormat ff_image2_demuxer = {
.name = "image2", .name = "image2",
.long_name = NULL_IF_CONFIG_SMALL("image2 sequence"), .long_name = NULL_IF_CONFIG_SMALL("image2 sequence"),
.priv_data_size = sizeof(VideoData), .priv_data_size = sizeof(VideoData),
@@ -423,7 +423,7 @@ AVInputFormat image2_demuxer = {
}; };
#endif #endif
#if CONFIG_IMAGE2PIPE_DEMUXER #if CONFIG_IMAGE2PIPE_DEMUXER
AVInputFormat image2pipe_demuxer = {
AVInputFormat ff_image2pipe_demuxer = {
.name = "image2pipe", .name = "image2pipe",
.long_name = NULL_IF_CONFIG_SMALL("piped image2 sequence"), .long_name = NULL_IF_CONFIG_SMALL("piped image2 sequence"),
.priv_data_size = sizeof(VideoData), .priv_data_size = sizeof(VideoData),
@@ -434,7 +434,7 @@ AVInputFormat image2pipe_demuxer = {


/* output */ /* output */
#if CONFIG_IMAGE2_MUXER #if CONFIG_IMAGE2_MUXER
AVOutputFormat image2_muxer = {
AVOutputFormat ff_image2_muxer = {
.name = "image2", .name = "image2",
.long_name = NULL_IF_CONFIG_SMALL("image2 sequence"), .long_name = NULL_IF_CONFIG_SMALL("image2 sequence"),
.extensions = "bmp,jpeg,jpg,ljpg,pam,pbm,pcx,pgm,pgmyuv,png," .extensions = "bmp,jpeg,jpg,ljpg,pam,pbm,pcx,pgm,pgmyuv,png,"
@@ -447,7 +447,7 @@ AVOutputFormat image2_muxer = {
}; };
#endif #endif
#if CONFIG_IMAGE2PIPE_MUXER #if CONFIG_IMAGE2PIPE_MUXER
AVOutputFormat image2pipe_muxer = {
AVOutputFormat ff_image2pipe_muxer = {
.name = "image2pipe", .name = "image2pipe",
.long_name = NULL_IF_CONFIG_SMALL("piped image2 sequence"), .long_name = NULL_IF_CONFIG_SMALL("piped image2 sequence"),
.priv_data_size = sizeof(VideoData), .priv_data_size = sizeof(VideoData),


+ 1
- 1
libavformat/ingenientdec.c View File

@@ -58,7 +58,7 @@ static int ingenient_read_packet(AVFormatContext *s, AVPacket *pkt)
return ret; return ret;
} }


AVInputFormat ingenient_demuxer = {
AVInputFormat ff_ingenient_demuxer = {
"ingenient", "ingenient",
NULL_IF_CONFIG_SMALL("raw Ingenient MJPEG"), NULL_IF_CONFIG_SMALL("raw Ingenient MJPEG"),
0, 0,


+ 1
- 1
libavformat/ipmovie.c View File

@@ -620,7 +620,7 @@ static int ipmovie_read_packet(AVFormatContext *s,
return ret; return ret;
} }


AVInputFormat ipmovie_demuxer = {
AVInputFormat ff_ipmovie_demuxer = {
"ipmovie", "ipmovie",
NULL_IF_CONFIG_SMALL("Interplay MVE format"), NULL_IF_CONFIG_SMALL("Interplay MVE format"),
sizeof(IPMVEContext), sizeof(IPMVEContext),


+ 1
- 1
libavformat/iss.c View File

@@ -122,7 +122,7 @@ static int iss_read_packet(AVFormatContext *s, AVPacket *pkt)
return 0; return 0;
} }


AVInputFormat iss_demuxer = {
AVInputFormat ff_iss_demuxer = {
"ISS", "ISS",
NULL_IF_CONFIG_SMALL("Funcom ISS format"), NULL_IF_CONFIG_SMALL("Funcom ISS format"),
sizeof(IssDemuxContext), sizeof(IssDemuxContext),


+ 1
- 1
libavformat/iv8.c View File

@@ -84,7 +84,7 @@ retry:
return ret; return ret;
} }


AVInputFormat iv8_demuxer = {
AVInputFormat ff_iv8_demuxer = {
"iv8", "iv8",
NULL_IF_CONFIG_SMALL("A format generated by IndigoVision 8000 video server"), NULL_IF_CONFIG_SMALL("A format generated by IndigoVision 8000 video server"),
0, 0,


+ 1
- 1
libavformat/ivfdec.c View File

@@ -79,7 +79,7 @@ static int read_packet(AVFormatContext *s, AVPacket *pkt)
return ret; return ret;
} }


AVInputFormat ivf_demuxer = {
AVInputFormat ff_ivf_demuxer = {
"ivf", "ivf",
NULL_IF_CONFIG_SMALL("On2 IVF"), NULL_IF_CONFIG_SMALL("On2 IVF"),
0, 0,


+ 1
- 1
libavformat/ivfenc.c View File

@@ -58,7 +58,7 @@ static int ivf_write_packet(AVFormatContext *s, AVPacket *pkt)
return 0; return 0;
} }


AVOutputFormat ivf_muxer = {
AVOutputFormat ff_ivf_muxer = {
.name = "ivf", .name = "ivf",
.long_name = NULL_IF_CONFIG_SMALL("On2 IVF"), .long_name = NULL_IF_CONFIG_SMALL("On2 IVF"),
.extensions = "ivf", .extensions = "ivf",


+ 2
- 2
libavformat/libnut.c View File

@@ -150,7 +150,7 @@ static int nut_write_trailer(AVFormatContext * avf) {
return 0; return 0;
} }


AVOutputFormat libnut_muxer = {
AVOutputFormat ff_libnut_muxer = {
"libnut", "libnut",
"nut format", "nut format",
"video/x-nut", "video/x-nut",
@@ -297,7 +297,7 @@ static int nut_read_close(AVFormatContext *s) {
return 0; return 0;
} }


AVInputFormat libnut_demuxer = {
AVInputFormat ff_libnut_demuxer = {
"libnut", "libnut",
NULL_IF_CONFIG_SMALL("NUT format"), NULL_IF_CONFIG_SMALL("NUT format"),
sizeof(NUTContext), sizeof(NUTContext),


+ 5
- 5
libavformat/librtmp.c View File

@@ -157,7 +157,7 @@ static int rtmp_get_file_handle(URLContext *s)
return RTMP_Socket(r); return RTMP_Socket(r);
} }


URLProtocol rtmp_protocol = {
URLProtocol ff_rtmp_protocol = {
"rtmp", "rtmp",
rtmp_open, rtmp_open,
rtmp_read, rtmp_read,
@@ -170,7 +170,7 @@ URLProtocol rtmp_protocol = {
rtmp_get_file_handle rtmp_get_file_handle
}; };


URLProtocol rtmpt_protocol = {
URLProtocol ff_rtmpt_protocol = {
"rtmpt", "rtmpt",
rtmp_open, rtmp_open,
rtmp_read, rtmp_read,
@@ -183,7 +183,7 @@ URLProtocol rtmpt_protocol = {
rtmp_get_file_handle rtmp_get_file_handle
}; };


URLProtocol rtmpe_protocol = {
URLProtocol ff_rtmpe_protocol = {
"rtmpe", "rtmpe",
rtmp_open, rtmp_open,
rtmp_read, rtmp_read,
@@ -196,7 +196,7 @@ URLProtocol rtmpe_protocol = {
rtmp_get_file_handle rtmp_get_file_handle
}; };


URLProtocol rtmpte_protocol = {
URLProtocol ff_rtmpte_protocol = {
"rtmpte", "rtmpte",
rtmp_open, rtmp_open,
rtmp_read, rtmp_read,
@@ -209,7 +209,7 @@ URLProtocol rtmpte_protocol = {
rtmp_get_file_handle rtmp_get_file_handle
}; };


URLProtocol rtmps_protocol = {
URLProtocol ff_rtmps_protocol = {
"rtmps", "rtmps",
rtmp_open, rtmp_open,
rtmp_read, rtmp_read,


+ 1
- 1
libavformat/lmlm4.c View File

@@ -117,7 +117,7 @@ static int lmlm4_read_packet(AVFormatContext *s, AVPacket *pkt) {
return ret; return ret;
} }


AVInputFormat lmlm4_demuxer = {
AVInputFormat ff_lmlm4_demuxer = {
"lmlm4", "lmlm4",
NULL_IF_CONFIG_SMALL("lmlm4 raw format"), NULL_IF_CONFIG_SMALL("lmlm4 raw format"),
0, 0,


+ 1
- 1
libavformat/lxfdec.c View File

@@ -336,7 +336,7 @@ static int lxf_read_packet(AVFormatContext *s, AVPacket *pkt)
return ret; return ret;
} }


AVInputFormat lxf_demuxer = {
AVInputFormat ff_lxf_demuxer = {
.name = "lxf", .name = "lxf",
.long_name = NULL_IF_CONFIG_SMALL("VR native stream format (LXF)"), .long_name = NULL_IF_CONFIG_SMALL("VR native stream format (LXF)"),
.priv_data_size = sizeof(LXFDemuxContext), .priv_data_size = sizeof(LXFDemuxContext),


+ 1
- 1
libavformat/m4vdec.c View File

@@ -49,7 +49,7 @@ static int mpeg4video_probe(AVProbeData *probe_packet)
return 0; return 0;
} }


AVInputFormat m4v_demuxer = {
AVInputFormat ff_m4v_demuxer = {
"m4v", "m4v",
NULL_IF_CONFIG_SMALL("raw MPEG-4 video format"), NULL_IF_CONFIG_SMALL("raw MPEG-4 video format"),
0, 0,


+ 1
- 1
libavformat/matroskadec.c View File

@@ -1920,7 +1920,7 @@ static int matroska_read_close(AVFormatContext *s)
return 0; return 0;
} }


AVInputFormat matroska_demuxer = {
AVInputFormat ff_matroska_demuxer = {
"matroska,webm", "matroska,webm",
NULL_IF_CONFIG_SMALL("Matroska/WebM file format"), NULL_IF_CONFIG_SMALL("Matroska/WebM file format"),
sizeof(MatroskaDemuxContext), sizeof(MatroskaDemuxContext),


+ 3
- 3
libavformat/matroskaenc.c View File

@@ -1177,7 +1177,7 @@ static int mkv_write_trailer(AVFormatContext *s)
} }


#if CONFIG_MATROSKA_MUXER #if CONFIG_MATROSKA_MUXER
AVOutputFormat matroska_muxer = {
AVOutputFormat ff_matroska_muxer = {
"matroska", "matroska",
NULL_IF_CONFIG_SMALL("Matroska file format"), NULL_IF_CONFIG_SMALL("Matroska file format"),
"video/x-matroska", "video/x-matroska",
@@ -1195,7 +1195,7 @@ AVOutputFormat matroska_muxer = {
#endif #endif


#if CONFIG_WEBM_MUXER #if CONFIG_WEBM_MUXER
AVOutputFormat webm_muxer = {
AVOutputFormat ff_webm_muxer = {
"webm", "webm",
NULL_IF_CONFIG_SMALL("WebM file format"), NULL_IF_CONFIG_SMALL("WebM file format"),
"video/webm", "video/webm",
@@ -1211,7 +1211,7 @@ AVOutputFormat webm_muxer = {
#endif #endif


#if CONFIG_MATROSKA_AUDIO_MUXER #if CONFIG_MATROSKA_AUDIO_MUXER
AVOutputFormat matroska_audio_muxer = {
AVOutputFormat ff_matroska_audio_muxer = {
"matroska", "matroska",
NULL_IF_CONFIG_SMALL("Matroska file format"), NULL_IF_CONFIG_SMALL("Matroska file format"),
"audio/x-matroska", "audio/x-matroska",


+ 2
- 2
libavformat/md5enc.c View File

@@ -65,7 +65,7 @@ static int write_trailer(struct AVFormatContext *s)
return 0; return 0;
} }


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


AVOutputFormat framemd5_muxer = {
AVOutputFormat ff_framemd5_muxer = {
"framemd5", "framemd5",
NULL_IF_CONFIG_SMALL("Per-frame MD5 testing format"), NULL_IF_CONFIG_SMALL("Per-frame MD5 testing format"),
NULL, NULL,


+ 1
- 1
libavformat/md5proto.c View File

@@ -82,7 +82,7 @@ static int md5_get_handle(URLContext *h)
return (intptr_t)h->priv_data; return (intptr_t)h->priv_data;
} }


URLProtocol md5_protocol = {
URLProtocol ff_md5_protocol = {
.name = "md5", .name = "md5",
.url_open = md5_open, .url_open = md5_open,
.url_write = md5_write, .url_write = md5_write,


+ 1
- 1
libavformat/mm.c View File

@@ -188,7 +188,7 @@ static int read_packet(AVFormatContext *s,
return 0; return 0;
} }


AVInputFormat mm_demuxer = {
AVInputFormat ff_mm_demuxer = {
"mm", "mm",
NULL_IF_CONFIG_SMALL("American Laser Games MM format"), NULL_IF_CONFIG_SMALL("American Laser Games MM format"),
sizeof(MmDemuxContext), sizeof(MmDemuxContext),


+ 2
- 2
libavformat/mmf.c View File

@@ -291,7 +291,7 @@ static int mmf_read_packet(AVFormatContext *s,
} }


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


+ 1
- 1
libavformat/mmsh.c View File

@@ -359,7 +359,7 @@ static int mmsh_read(URLContext *h, uint8_t *buf, int size)
return res; return res;
} }


URLProtocol mmsh_protocol = {
URLProtocol ff_mmsh_protocol = {
.name = "mmsh", .name = "mmsh",
.url_open = mmsh_open, .url_open = mmsh_open,
.url_read = mmsh_read, .url_read = mmsh_read,


+ 1
- 1
libavformat/mmst.c View File

@@ -621,7 +621,7 @@ static int mms_read(URLContext *h, uint8_t *buf, int size)
return result; return result;
} }


URLProtocol mmst_protocol = {
URLProtocol ff_mmst_protocol = {
"mmst", "mmst",
mms_open, mms_open,
mms_read, mms_read,


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

Write Preview
Loading…
Cancel
Save