Make long_names in lavf/lavdev optional depending on CONFIG_SMALL.

patch by Stefano Sabatini, stefano.sabatini-lala poste.it
along with some spelling/consistency fixes for the long names by me

Originally committed as revision 13649 to svn://svn.ffmpeg.org/ffmpeg/trunk
pull/126/head
Stefano Sabatini 17 years ago committed by Diego Biurrun
parent ca162a5004
commit bde15e74de
  1. 4
      libavdevice/audio.c
  2. 2
      libavdevice/bktr.c
  3. 2
      libavdevice/dv1394.c
  4. 4
      libavdevice/libdc1394.c
  5. 2
      libavdevice/v4l.c
  6. 2
      libavdevice/v4l2.c
  7. 2
      libavdevice/vfwcap.c
  8. 2
      libavdevice/x11grab.c
  9. 2
      libavformat/4xm.c
  10. 2
      libavformat/adtsenc.c
  11. 4
      libavformat/aiff.c
  12. 4
      libavformat/amr.c
  13. 2
      libavformat/apc.c
  14. 2
      libavformat/ape.c
  15. 4
      libavformat/asf-enc.c
  16. 2
      libavformat/asf.c
  17. 4
      libavformat/au.c
  18. 10
      libavformat/avformat.h
  19. 2
      libavformat/avidec.c
  20. 2
      libavformat/avienc.c
  21. 2
      libavformat/avisynth.c
  22. 2
      libavformat/avs.c
  23. 2
      libavformat/bethsoftvid.c
  24. 2
      libavformat/bfi.c
  25. 2
      libavformat/c93.c
  26. 2
      libavformat/crcenc.c
  27. 2
      libavformat/daud.c
  28. 2
      libavformat/dsicin.c
  29. 2
      libavformat/dv.c
  30. 2
      libavformat/dvenc.c
  31. 2
      libavformat/dxa.c
  32. 2
      libavformat/eacdata.c
  33. 2
      libavformat/electronicarts.c
  34. 2
      libavformat/ffmdec.c
  35. 2
      libavformat/ffmenc.c
  36. 2
      libavformat/flic.c
  37. 2
      libavformat/flvdec.c
  38. 2
      libavformat/flvenc.c
  39. 2
      libavformat/framecrcenc.c
  40. 2
      libavformat/gif.c
  41. 2
      libavformat/gifdec.c
  42. 2
      libavformat/gxf.c
  43. 2
      libavformat/gxfenc.c
  44. 2
      libavformat/idcin.c
  45. 2
      libavformat/idroq.c
  46. 2
      libavformat/iff.c
  47. 8
      libavformat/img2.c
  48. 2
      libavformat/ipmovie.c
  49. 2
      libavformat/libnut.c
  50. 2
      libavformat/lmlm4.c
  51. 2
      libavformat/matroskadec.c
  52. 4
      libavformat/matroskaenc.c
  53. 2
      libavformat/mm.c
  54. 4
      libavformat/mmf.c
  55. 2
      libavformat/mov.c
  56. 12
      libavformat/movenc.c
  57. 6
      libavformat/mp3.c
  58. 2
      libavformat/mpc.c
  59. 2
      libavformat/mpc8.c
  60. 2
      libavformat/mpeg.c
  61. 10
      libavformat/mpegenc.c
  62. 4
      libavformat/mpegts.c
  63. 2
      libavformat/mpegtsenc.c
  64. 2
      libavformat/mpjpeg.c
  65. 2
      libavformat/msnwc_tcp.c
  66. 2
      libavformat/mtv.c
  67. 2
      libavformat/mxf.c
  68. 2
      libavformat/nsvdec.c
  69. 2
      libavformat/nutdec.c
  70. 2
      libavformat/nutenc.c
  71. 2
      libavformat/nuv.c
  72. 2
      libavformat/oggdec.c
  73. 2
      libavformat/oggenc.c
  74. 2
      libavformat/psxstr.c
  75. 2
      libavformat/pva.c
  76. 66
      libavformat/raw.c
  77. 2
      libavformat/rl2.c
  78. 2
      libavformat/rmdec.c
  79. 2
      libavformat/rmenc.c
  80. 2
      libavformat/rpl.c
  81. 2
      libavformat/rtpenc.c
  82. 6
      libavformat/rtsp.c
  83. 2
      libavformat/segafilm.c
  84. 2
      libavformat/sierravmd.c
  85. 2
      libavformat/siff.c
  86. 2
      libavformat/smacker.c
  87. 2
      libavformat/sol.c
  88. 2
      libavformat/swfdec.c
  89. 4
      libavformat/swfenc.c
  90. 2
      libavformat/thp.c
  91. 2
      libavformat/tiertexseq.c
  92. 2
      libavformat/tta.c
  93. 2
      libavformat/txd.c
  94. 2
      libavformat/vc1test.c
  95. 2
      libavformat/vocdec.c
  96. 2
      libavformat/vocenc.c
  97. 4
      libavformat/wav.c
  98. 2
      libavformat/wc3movie.c
  99. 4
      libavformat/westwood.c
  100. 2
      libavformat/wv.c
  101. Some files were not shown because too many files have changed in this diff Show More

@ -315,7 +315,7 @@ static int audio_read_close(AVFormatContext *s1)
#ifdef CONFIG_OSS_DEMUXER #ifdef CONFIG_OSS_DEMUXER
AVInputFormat oss_demuxer = { AVInputFormat oss_demuxer = {
"oss", "oss",
"audio grab and output", NULL_IF_CONFIG_SMALL("audio grab and output"),
sizeof(AudioData), sizeof(AudioData),
NULL, NULL,
audio_read_header, audio_read_header,
@ -328,7 +328,7 @@ AVInputFormat oss_demuxer = {
#ifdef CONFIG_OSS_MUXER #ifdef CONFIG_OSS_MUXER
AVOutputFormat oss_muxer = { AVOutputFormat oss_muxer = {
"oss", "oss",
"audio grab and output", NULL_IF_CONFIG_SMALL("audio grab and output"),
"", "",
"", "",
sizeof(AudioData), sizeof(AudioData),

@ -311,7 +311,7 @@ static int grab_read_close(AVFormatContext *s1)
AVInputFormat bktr_demuxer = { AVInputFormat bktr_demuxer = {
"bktr", "bktr",
"video grab", NULL_IF_CONFIG_SMALL("video grab"),
sizeof(VideoData), sizeof(VideoData),
NULL, NULL,
grab_read_header, grab_read_header,

@ -228,7 +228,7 @@ static int dv1394_close(AVFormatContext * context)
AVInputFormat dv1394_demuxer = { AVInputFormat dv1394_demuxer = {
.name = "dv1394", .name = "dv1394",
.long_name = "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),
.read_header = dv1394_read_header, .read_header = dv1394_read_header,
.read_packet = dv1394_read_packet, .read_packet = dv1394_read_packet,

@ -350,7 +350,7 @@ static int dc1394_v2_close(AVFormatContext * context)
AVInputFormat libdc1394_demuxer = { AVInputFormat libdc1394_demuxer = {
.name = "libdc1394", .name = "libdc1394",
.long_name = "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),
.read_header = dc1394_v2_read_header, .read_header = dc1394_v2_read_header,
.read_packet = dc1394_v2_read_packet, .read_packet = dc1394_v2_read_packet,
@ -362,7 +362,7 @@ AVInputFormat libdc1394_demuxer = {
#if ENABLE_LIBDC1394_1 #if ENABLE_LIBDC1394_1
AVInputFormat libdc1394_demuxer = { AVInputFormat libdc1394_demuxer = {
.name = "libdc1394", .name = "libdc1394",
.long_name = "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),
.read_header = dc1394_v1_read_header, .read_header = dc1394_v1_read_header,
.read_packet = dc1394_v1_read_packet, .read_packet = dc1394_v1_read_packet,

@ -346,7 +346,7 @@ static int grab_read_close(AVFormatContext *s1)
AVInputFormat v4l_demuxer = { AVInputFormat v4l_demuxer = {
"video4linux", "video4linux",
"video grab", NULL_IF_CONFIG_SMALL("video grab"),
sizeof(VideoData), sizeof(VideoData),
NULL, NULL,
grab_read_header, grab_read_header,

@ -635,7 +635,7 @@ static int v4l2_read_close(AVFormatContext *s1)
AVInputFormat v4l2_demuxer = { AVInputFormat v4l2_demuxer = {
"video4linux2", "video4linux2",
"video grab", NULL_IF_CONFIG_SMALL("video grab"),
sizeof(struct video_data), sizeof(struct video_data),
NULL, NULL,
v4l2_read_header, v4l2_read_header,

@ -456,7 +456,7 @@ static int vfw_read_close(AVFormatContext *s)
AVInputFormat vfwcap_demuxer = { AVInputFormat vfwcap_demuxer = {
"vfwcap", "vfwcap",
"VFW video capture", NULL_IF_CONFIG_SMALL("VFW video capture"),
sizeof(struct vfw_ctx), sizeof(struct vfw_ctx),
NULL, NULL,
vfw_read_header, vfw_read_header,

@ -519,7 +519,7 @@ x11grab_read_close(AVFormatContext *s1)
AVInputFormat x11_grab_device_demuxer = AVInputFormat x11_grab_device_demuxer =
{ {
"x11grab", "x11grab",
"X11grab", NULL_IF_CONFIG_SMALL("X11grab"),
sizeof(x11_grab_t), sizeof(x11_grab_t),
NULL, NULL,
x11grab_read_header, x11grab_read_header,

@ -328,7 +328,7 @@ static int fourxm_read_close(AVFormatContext *s)
AVInputFormat fourxm_demuxer = { AVInputFormat fourxm_demuxer = {
"4xm", "4xm",
"4X Technologies format", NULL_IF_CONFIG_SMALL("4X Technologies format"),
sizeof(FourxmDemuxContext), sizeof(FourxmDemuxContext),
fourxm_probe, fourxm_probe,
fourxm_read_header, fourxm_read_header,

@ -107,7 +107,7 @@ static int adts_write_packet(AVFormatContext *s, AVPacket *pkt)
AVOutputFormat adts_muxer = { AVOutputFormat adts_muxer = {
"adts", "adts",
"ADTS AAC", NULL_IF_CONFIG_SMALL("ADTS AAC"),
"audio/aac", "audio/aac",
"aac", "aac",
sizeof(ADTSContext), sizeof(ADTSContext),

@ -442,7 +442,7 @@ static int aiff_read_seek(AVFormatContext *s,
#ifdef CONFIG_AIFF_DEMUXER #ifdef CONFIG_AIFF_DEMUXER
AVInputFormat aiff_demuxer = { AVInputFormat aiff_demuxer = {
"aiff", "aiff",
"Audio IFF", NULL_IF_CONFIG_SMALL("Audio IFF"),
0, 0,
aiff_probe, aiff_probe,
aiff_read_header, aiff_read_header,
@ -456,7 +456,7 @@ AVInputFormat aiff_demuxer = {
#ifdef CONFIG_AIFF_MUXER #ifdef CONFIG_AIFF_MUXER
AVOutputFormat aiff_muxer = { AVOutputFormat aiff_muxer = {
"aiff", "aiff",
"Audio IFF", NULL_IF_CONFIG_SMALL("Audio IFF"),
"audio/aiff", "audio/aiff",
"aif,aiff,afc,aifc", "aif,aiff,afc,aifc",
sizeof(AIFFOutputContext), sizeof(AIFFOutputContext),

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

@ -82,7 +82,7 @@ static int apc_read_packet(AVFormatContext *s, AVPacket *pkt)
AVInputFormat apc_demuxer = { AVInputFormat apc_demuxer = {
"apc", "apc",
"CRYO APC format", NULL_IF_CONFIG_SMALL("CRYO APC format"),
0, 0,
apc_probe, apc_probe,
apc_read_header, apc_read_header,

@ -511,7 +511,7 @@ static int ape_read_seek(AVFormatContext *s, int stream_index, int64_t timestamp
AVInputFormat ape_demuxer = { AVInputFormat ape_demuxer = {
"ape", "ape",
"Monkey's Audio", NULL_IF_CONFIG_SMALL("Monkey's Audio"),
sizeof(APEContext), sizeof(APEContext),
ape_probe, ape_probe,
ape_read_header, ape_read_header,

@ -815,7 +815,7 @@ static int asf_write_trailer(AVFormatContext *s)
#ifdef CONFIG_ASF_MUXER #ifdef CONFIG_ASF_MUXER
AVOutputFormat asf_muxer = { AVOutputFormat asf_muxer = {
"asf", "asf",
"asf format", NULL_IF_CONFIG_SMALL("ASF format"),
"video/x-ms-asf", "video/x-ms-asf",
"asf,wmv,wma", "asf,wmv,wma",
sizeof(ASFContext), sizeof(ASFContext),
@ -836,7 +836,7 @@ AVOutputFormat asf_muxer = {
#ifdef CONFIG_ASF_STREAM_MUXER #ifdef CONFIG_ASF_STREAM_MUXER
AVOutputFormat asf_stream_muxer = { AVOutputFormat asf_stream_muxer = {
"asf_stream", "asf_stream",
"asf format", NULL_IF_CONFIG_SMALL("ASF format"),
"video/x-ms-asf", "video/x-ms-asf",
"asf,wmv,wma", "asf,wmv,wma",
sizeof(ASFContext), sizeof(ASFContext),

@ -1094,7 +1094,7 @@ static int asf_read_seek(AVFormatContext *s, int stream_index, int64_t pts, int
AVInputFormat asf_demuxer = { AVInputFormat asf_demuxer = {
"asf", "asf",
"asf format", NULL_IF_CONFIG_SMALL("ASF format"),
sizeof(ASFContext), sizeof(ASFContext),
asf_probe, asf_probe,
asf_read_header, asf_read_header,

@ -180,7 +180,7 @@ static int au_read_close(AVFormatContext *s)
#ifdef CONFIG_AU_DEMUXER #ifdef CONFIG_AU_DEMUXER
AVInputFormat au_demuxer = { AVInputFormat au_demuxer = {
"au", "au",
"SUN AU Format", NULL_IF_CONFIG_SMALL("SUN AU format"),
0, 0,
au_probe, au_probe,
au_read_header, au_read_header,
@ -194,7 +194,7 @@ AVInputFormat au_demuxer = {
#ifdef CONFIG_AU_MUXER #ifdef CONFIG_AU_MUXER
AVOutputFormat au_muxer = { AVOutputFormat au_muxer = {
"au", "au",
"SUN AU Format", NULL_IF_CONFIG_SMALL("SUN AU format"),
"audio/basic", "audio/basic",
"au", "au",
0, 0,

@ -185,6 +185,11 @@ typedef struct AVFormatParameters {
typedef struct AVOutputFormat { typedef struct AVOutputFormat {
const char *name; const char *name;
/**
* Descriptive name for the format, meant to be more human-readable
* than \p name. You \e should use the NULL_IF_CONFIG_SMALL() macro
* to define it.
*/
const char *long_name; const char *long_name;
const char *mime_type; const char *mime_type;
const char *extensions; /**< comma separated filename extensions */ const char *extensions; /**< comma separated filename extensions */
@ -216,6 +221,11 @@ typedef struct AVOutputFormat {
typedef struct AVInputFormat { typedef struct AVInputFormat {
const char *name; const char *name;
/**
* Descriptive name for the format, meant to be more human-readable
* than \p name. You \e should use the NULL_IF_CONFIG_SMALL() macro
* to define it.
*/
const char *long_name; const char *long_name;
/** size of private data so that it can be allocated in the wrapper */ /** size of private data so that it can be allocated in the wrapper */
int priv_data_size; int priv_data_size;

@ -1087,7 +1087,7 @@ static int avi_probe(AVProbeData *p)
AVInputFormat avi_demuxer = { AVInputFormat avi_demuxer = {
"avi", "avi",
"avi format", NULL_IF_CONFIG_SMALL("AVI format"),
sizeof(AVIContext), sizeof(AVIContext),
avi_probe, avi_probe,
avi_read_header, avi_read_header,

@ -593,7 +593,7 @@ static int avi_write_trailer(AVFormatContext *s)
AVOutputFormat avi_muxer = { AVOutputFormat avi_muxer = {
"avi", "avi",
"avi format", NULL_IF_CONFIG_SMALL("AVI format"),
"video/x-msvideo", "video/x-msvideo",
"avi", "avi",
sizeof(AVIContext), sizeof(AVIContext),

@ -209,7 +209,7 @@ static int avisynth_read_seek(AVFormatContext *s, int stream_index, int64_t pts,
AVInputFormat avisynth_demuxer = { AVInputFormat avisynth_demuxer = {
"avs", "avs",
"AVISynth", NULL_IF_CONFIG_SMALL("AVISynth"),
sizeof(AVISynthContext), sizeof(AVISynthContext),
NULL, NULL,
avisynth_read_header, avisynth_read_header,

@ -217,7 +217,7 @@ static int avs_read_close(AVFormatContext * s)
AVInputFormat avs_demuxer = { AVInputFormat avs_demuxer = {
"avs", "avs",
"avs format", NULL_IF_CONFIG_SMALL("AVS format"),
sizeof(avs_format_t), sizeof(avs_format_t),
avs_probe, avs_probe,
avs_read_header, avs_read_header,

@ -225,7 +225,7 @@ static int vid_read_packet(AVFormatContext *s,
AVInputFormat bethsoftvid_demuxer = { AVInputFormat bethsoftvid_demuxer = {
"bethsoftvid", "bethsoftvid",
"Bethesda Softworks 'Daggerfall' VID format", NULL_IF_CONFIG_SMALL("Bethesda Softworks VID format"),
sizeof(BVID_DemuxContext), sizeof(BVID_DemuxContext),
vid_probe, vid_probe,
vid_read_header, vid_read_header,

@ -159,7 +159,7 @@ static int bfi_read_packet(AVFormatContext * s, AVPacket * pkt)
AVInputFormat bfi_demuxer = { AVInputFormat bfi_demuxer = {
"bfi", "bfi",
"Brute Force & Ignorance", NULL_IF_CONFIG_SMALL("Brute Force & Ignorance"),
sizeof(BFIContext), sizeof(BFIContext),
bfi_probe, bfi_probe,
bfi_read_header, bfi_read_header,

@ -190,7 +190,7 @@ static int read_packet(AVFormatContext *s, AVPacket *pkt)
AVInputFormat c93_demuxer = { AVInputFormat c93_demuxer = {
"c93", "c93",
"Interplay C93", NULL_IF_CONFIG_SMALL("Interplay C93"),
sizeof(C93DemuxContext), sizeof(C93DemuxContext),
probe, probe,
read_header, read_header,

@ -56,7 +56,7 @@ static int crc_write_trailer(struct AVFormatContext *s)
AVOutputFormat crc_muxer = { AVOutputFormat crc_muxer = {
"crc", "crc",
"crc testing format", NULL_IF_CONFIG_SMALL("CRC testing format"),
NULL, NULL,
"", "",
sizeof(CRCState), sizeof(CRCState),

@ -49,7 +49,7 @@ static int daud_packet(AVFormatContext *s, AVPacket *pkt) {
AVInputFormat daud_demuxer = { AVInputFormat daud_demuxer = {
"daud", "daud",
"D-Cinema audio format", NULL_IF_CONFIG_SMALL("D-Cinema audio format"),
0, 0,
NULL, NULL,
daud_header, daud_header,

@ -213,7 +213,7 @@ static int cin_read_packet(AVFormatContext *s, AVPacket *pkt)
AVInputFormat dsicin_demuxer = { AVInputFormat dsicin_demuxer = {
"dsicin", "dsicin",
"Delphine Software International CIN format", NULL_IF_CONFIG_SMALL("Delphine Software International CIN format"),
sizeof(CinDemuxContext), sizeof(CinDemuxContext),
cin_probe, cin_probe,
cin_read_header, cin_read_header,

@ -440,7 +440,7 @@ static int dv_read_close(AVFormatContext *s)
#ifdef CONFIG_DV_DEMUXER #ifdef CONFIG_DV_DEMUXER
AVInputFormat dv_demuxer = { AVInputFormat dv_demuxer = {
"dv", "dv",
"DV video format", NULL_IF_CONFIG_SMALL("DV video format"),
sizeof(RawDVContext), sizeof(RawDVContext),
NULL, NULL,
dv_read_header, dv_read_header,

@ -402,7 +402,7 @@ static int dv_write_trailer(struct AVFormatContext *s)
#ifdef CONFIG_DV_MUXER #ifdef CONFIG_DV_MUXER
AVOutputFormat dv_muxer = { AVOutputFormat dv_muxer = {
"dv", "dv",
"DV video format", NULL_IF_CONFIG_SMALL("DV video format"),
NULL, NULL,
"dv", "dv",
sizeof(DVMuxContext), sizeof(DVMuxContext),

@ -204,7 +204,7 @@ static int dxa_read_packet(AVFormatContext *s, AVPacket *pkt)
AVInputFormat dxa_demuxer = { AVInputFormat dxa_demuxer = {
"dxa", "dxa",
"dxa", NULL_IF_CONFIG_SMALL("DXA"),
sizeof(DXAContext), sizeof(DXAContext),
dxa_probe, dxa_probe,
dxa_read_header, dxa_read_header,

@ -91,7 +91,7 @@ static int cdata_read_packet(AVFormatContext *s, AVPacket *pkt)
AVInputFormat ea_cdata_demuxer = { AVInputFormat ea_cdata_demuxer = {
"ea_cdata", "ea_cdata",
"Electronic Arts cdata", NULL_IF_CONFIG_SMALL("Electronic Arts cdata"),
sizeof(CdataDemuxContext), sizeof(CdataDemuxContext),
cdata_probe, cdata_probe,
cdata_read_header, cdata_read_header,

@ -465,7 +465,7 @@ static int ea_read_packet(AVFormatContext *s,
AVInputFormat ea_demuxer = { AVInputFormat ea_demuxer = {
"ea", "ea",
"Electronic Arts Multimedia Format", NULL_IF_CONFIG_SMALL("Electronic Arts Multimedia Format"),
sizeof(EaDemuxContext), sizeof(EaDemuxContext),
ea_probe, ea_probe,
ea_read_header, ea_read_header,

@ -480,7 +480,7 @@ static int ffm_probe(AVProbeData *p)
AVInputFormat ffm_demuxer = { AVInputFormat ffm_demuxer = {
"ffm", "ffm",
"ffm format", NULL_IF_CONFIG_SMALL("ffm format"),
sizeof(FFMContext), sizeof(FFMContext),
ffm_probe, ffm_probe,
ffm_read_header, ffm_read_header,

@ -253,7 +253,7 @@ static int ffm_write_trailer(AVFormatContext *s)
AVOutputFormat ffm_muxer = { AVOutputFormat ffm_muxer = {
"ffm", "ffm",
"ffm format", NULL_IF_CONFIG_SMALL("ffm format"),
"", "",
"ffm", "ffm",
sizeof(FFMContext), sizeof(FFMContext),

@ -194,7 +194,7 @@ static int flic_read_close(AVFormatContext *s)
AVInputFormat flic_demuxer = { AVInputFormat flic_demuxer = {
"flic", "flic",
"FLI/FLC/FLX animation format", NULL_IF_CONFIG_SMALL("FLI/FLC/FLX animation format"),
sizeof(FlicDemuxContext), sizeof(FlicDemuxContext),
flic_probe, flic_probe,
flic_read_header, flic_read_header,

@ -419,7 +419,7 @@ static int flv_read_packet(AVFormatContext *s, AVPacket *pkt)
AVInputFormat flv_demuxer = { AVInputFormat flv_demuxer = {
"flv", "flv",
"flv format", NULL_IF_CONFIG_SMALL("FLV format"),
0, 0,
flv_probe, flv_probe,
flv_read_header, flv_read_header,

@ -374,7 +374,7 @@ static int flv_write_packet(AVFormatContext *s, AVPacket *pkt)
AVOutputFormat flv_muxer = { AVOutputFormat flv_muxer = {
"flv", "flv",
"flv format", NULL_IF_CONFIG_SMALL("FLV format"),
"video/x-flv", "video/x-flv",
"flv", "flv",
sizeof(FLVContext), sizeof(FLVContext),

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

@ -407,7 +407,7 @@ static int gif_write_trailer(AVFormatContext *s)
AVOutputFormat gif_muxer = { AVOutputFormat gif_muxer = {
"gif", "gif",
"GIF Animation", NULL_IF_CONFIG_SMALL("GIF Animation"),
"image/gif", "image/gif",
"gif", "gif",
sizeof(GIFContext), sizeof(GIFContext),

@ -581,7 +581,7 @@ static int gif_read_close(AVFormatContext *s1)
AVInputFormat gif_demuxer = AVInputFormat gif_demuxer =
{ {
"gif", "gif",
"gif format", NULL_IF_CONFIG_SMALL("GIF format"),
sizeof(GifState), sizeof(GifState),
gif_video_probe, gif_video_probe,
gif_read_header, gif_read_header,

@ -492,7 +492,7 @@ static int64_t gxf_read_timestamp(AVFormatContext *s, int stream_index,
AVInputFormat gxf_demuxer = { AVInputFormat gxf_demuxer = {
"gxf", "gxf",
"GXF format", NULL_IF_CONFIG_SMALL("GXF format"),
0, 0,
gxf_probe, gxf_probe,
gxf_header, gxf_header,

@ -813,7 +813,7 @@ static int gxf_interleave_packet(AVFormatContext *s, AVPacket *out, AVPacket *pk
AVOutputFormat gxf_muxer = { AVOutputFormat gxf_muxer = {
"gxf", "gxf",
"GXF format", NULL_IF_CONFIG_SMALL("GXF format"),
NULL, NULL,
"gxf", "gxf",
sizeof(GXFContext), sizeof(GXFContext),

@ -288,7 +288,7 @@ static int idcin_read_close(AVFormatContext *s)
AVInputFormat idcin_demuxer = { AVInputFormat idcin_demuxer = {
"idcin", "idcin",
"Id CIN format", NULL_IF_CONFIG_SMALL("Id CIN format"),
sizeof(IdcinDemuxContext), sizeof(IdcinDemuxContext),
idcin_probe, idcin_probe,
idcin_read_header, idcin_read_header,

@ -279,7 +279,7 @@ static int roq_read_close(AVFormatContext *s)
AVInputFormat roq_demuxer = { AVInputFormat roq_demuxer = {
"RoQ", "RoQ",
"Id RoQ format", NULL_IF_CONFIG_SMALL("Id RoQ format"),
sizeof(RoqDemuxContext), sizeof(RoqDemuxContext),
roq_probe, roq_probe,
roq_read_header, roq_read_header,

@ -192,7 +192,7 @@ static int iff_read_packet(AVFormatContext *s,
AVInputFormat iff_demuxer = { AVInputFormat iff_demuxer = {
"IFF", "IFF",
"IFF format", NULL_IF_CONFIG_SMALL("IFF format"),
sizeof(IffDemuxContext), sizeof(IffDemuxContext),
iff_probe, iff_probe,
iff_read_header, iff_read_header,

@ -379,7 +379,7 @@ static int img_write_packet(AVFormatContext *s, AVPacket *pkt)
#ifdef CONFIG_IMAGE2_DEMUXER #ifdef CONFIG_IMAGE2_DEMUXER
AVInputFormat image2_demuxer = { AVInputFormat image2_demuxer = {
"image2", "image2",
"image2 sequence", NULL_IF_CONFIG_SMALL("image2 sequence"),
sizeof(VideoData), sizeof(VideoData),
image_probe, image_probe,
img_read_header, img_read_header,
@ -393,7 +393,7 @@ AVInputFormat image2_demuxer = {
#ifdef CONFIG_IMAGE2PIPE_DEMUXER #ifdef CONFIG_IMAGE2PIPE_DEMUXER
AVInputFormat image2pipe_demuxer = { AVInputFormat image2pipe_demuxer = {
"image2pipe", "image2pipe",
"piped image2 sequence", NULL_IF_CONFIG_SMALL("piped image2 sequence"),
sizeof(VideoData), sizeof(VideoData),
NULL, /* no probe */ NULL, /* no probe */
img_read_header, img_read_header,
@ -407,7 +407,7 @@ AVInputFormat image2pipe_demuxer = {
#ifdef CONFIG_IMAGE2_MUXER #ifdef CONFIG_IMAGE2_MUXER
AVOutputFormat image2_muxer = { AVOutputFormat image2_muxer = {
"image2", "image2",
"image2 sequence", NULL_IF_CONFIG_SMALL("image2 sequence"),
"", "",
"", "",
sizeof(VideoData), sizeof(VideoData),
@ -422,7 +422,7 @@ AVOutputFormat image2_muxer = {
#ifdef CONFIG_IMAGE2PIPE_MUXER #ifdef CONFIG_IMAGE2PIPE_MUXER
AVOutputFormat image2pipe_muxer = { AVOutputFormat image2pipe_muxer = {
"image2pipe", "image2pipe",
"piped image2 sequence", NULL_IF_CONFIG_SMALL("piped image2 sequence"),
"", "",
"", "",
sizeof(VideoData), sizeof(VideoData),

@ -616,7 +616,7 @@ static int ipmovie_read_close(AVFormatContext *s)
AVInputFormat ipmovie_demuxer = { AVInputFormat ipmovie_demuxer = {
"ipmovie", "ipmovie",
"Interplay MVE format", NULL_IF_CONFIG_SMALL("Interplay MVE format"),
sizeof(IPMVEContext), sizeof(IPMVEContext),
ipmovie_probe, ipmovie_probe,
ipmovie_read_header, ipmovie_read_header,

@ -299,7 +299,7 @@ static int nut_read_close(AVFormatContext *s) {
AVInputFormat libnut_demuxer = { AVInputFormat libnut_demuxer = {
"libnut", "libnut",
"nut format", NULL_IF_CONFIG_SMALL("NUT format"),
sizeof(NUTContext), sizeof(NUTContext),
nut_probe, nut_probe,
nut_read_header, nut_read_header,

@ -118,7 +118,7 @@ static int lmlm4_read_packet(AVFormatContext *s, AVPacket *pkt) {
AVInputFormat lmlm4_demuxer = { AVInputFormat lmlm4_demuxer = {
"lmlm4", "lmlm4",
"lmlm4 raw format", NULL_IF_CONFIG_SMALL("lmlm4 raw format"),
0, 0,
lmlm4_probe, lmlm4_probe,
lmlm4_read_header, lmlm4_read_header,

@ -3248,7 +3248,7 @@ matroska_read_close (AVFormatContext *s)
AVInputFormat matroska_demuxer = { AVInputFormat matroska_demuxer = {
"matroska", "matroska",
"Matroska file format", NULL_IF_CONFIG_SMALL("Matroska file format"),
sizeof(MatroskaDemuxContext), sizeof(MatroskaDemuxContext),
matroska_probe, matroska_probe,
matroska_read_header, matroska_read_header,

@ -819,7 +819,7 @@ static int mkv_write_trailer(AVFormatContext *s)
AVOutputFormat matroska_muxer = { AVOutputFormat matroska_muxer = {
"matroska", "matroska",
"Matroska File Format", NULL_IF_CONFIG_SMALL("Matroska file format"),
"video/x-matroska", "video/x-matroska",
"mkv", "mkv",
sizeof(MatroskaMuxContext), sizeof(MatroskaMuxContext),
@ -834,7 +834,7 @@ AVOutputFormat matroska_muxer = {
AVOutputFormat matroska_audio_muxer = { AVOutputFormat matroska_audio_muxer = {
"matroska", "matroska",
"Matroska File Format", NULL_IF_CONFIG_SMALL("Matroska file format"),
"audio/x-matroska", "audio/x-matroska",
"mka", "mka",
sizeof(MatroskaMuxContext), sizeof(MatroskaMuxContext),

@ -201,7 +201,7 @@ static int mm_read_close(AVFormatContext *s)
AVInputFormat mm_demuxer = { AVInputFormat mm_demuxer = {
"mm", "mm",
"American Laser Games MM format", NULL_IF_CONFIG_SMALL("American Laser Games MM format"),
sizeof(MmDemuxContext), sizeof(MmDemuxContext),
mm_probe, mm_probe,
mm_read_header, mm_read_header,

@ -304,7 +304,7 @@ static int mmf_read_seek(AVFormatContext *s,
#ifdef CONFIG_MMF_DEMUXER #ifdef CONFIG_MMF_DEMUXER
AVInputFormat mmf_demuxer = { AVInputFormat mmf_demuxer = {
"mmf", "mmf",
"mmf format", NULL_IF_CONFIG_SMALL("mmf format"),
sizeof(MMFContext), sizeof(MMFContext),
mmf_probe, mmf_probe,
mmf_read_header, mmf_read_header,
@ -316,7 +316,7 @@ AVInputFormat mmf_demuxer = {
#ifdef CONFIG_MMF_MUXER #ifdef CONFIG_MMF_MUXER
AVOutputFormat mmf_muxer = { AVOutputFormat mmf_muxer = {
"mmf", "mmf",
"mmf format", NULL_IF_CONFIG_SMALL("mmf format"),
"application/vnd.smaf", "application/vnd.smaf",
"mmf", "mmf",
sizeof(MMFContext), sizeof(MMFContext),

@ -1914,7 +1914,7 @@ static int mov_read_close(AVFormatContext *s)
AVInputFormat mov_demuxer = { AVInputFormat mov_demuxer = {
"mov,mp4,m4a,3gp,3g2,mj2", "mov,mp4,m4a,3gp,3g2,mj2",
"QuickTime/MPEG4/Motion JPEG 2000 format", NULL_IF_CONFIG_SMALL("QuickTime/MPEG-4/Motion JPEG 2000 format"),
sizeof(MOVContext), sizeof(MOVContext),
mov_probe, mov_probe,
mov_read_header, mov_read_header,

@ -1666,7 +1666,7 @@ static int mov_write_trailer(AVFormatContext *s)
#ifdef CONFIG_MOV_MUXER #ifdef CONFIG_MOV_MUXER
AVOutputFormat mov_muxer = { AVOutputFormat mov_muxer = {
"mov", "mov",
"mov format", NULL_IF_CONFIG_SMALL("MOV format"),
NULL, NULL,
"mov", "mov",
sizeof(MOVContext), sizeof(MOVContext),
@ -1682,7 +1682,7 @@ AVOutputFormat mov_muxer = {
#ifdef CONFIG_TGP_MUXER #ifdef CONFIG_TGP_MUXER
AVOutputFormat tgp_muxer = { AVOutputFormat tgp_muxer = {
"3gp", "3gp",
"3gp format", NULL_IF_CONFIG_SMALL("3GP format"),
NULL, NULL,
"3gp", "3gp",
sizeof(MOVContext), sizeof(MOVContext),
@ -1698,7 +1698,7 @@ AVOutputFormat tgp_muxer = {
#ifdef CONFIG_MP4_MUXER #ifdef CONFIG_MP4_MUXER
AVOutputFormat mp4_muxer = { AVOutputFormat mp4_muxer = {
"mp4", "mp4",
"mp4 format", NULL_IF_CONFIG_SMALL("MP4 format"),
"application/mp4", "application/mp4",
"mp4,m4a", "mp4,m4a",
sizeof(MOVContext), sizeof(MOVContext),
@ -1714,7 +1714,7 @@ AVOutputFormat mp4_muxer = {
#ifdef CONFIG_PSP_MUXER #ifdef CONFIG_PSP_MUXER
AVOutputFormat psp_muxer = { AVOutputFormat psp_muxer = {
"psp", "psp",
"psp mp4 format", NULL_IF_CONFIG_SMALL("PSP MP4 format"),
NULL, NULL,
"mp4,psp", "mp4,psp",
sizeof(MOVContext), sizeof(MOVContext),
@ -1730,7 +1730,7 @@ AVOutputFormat psp_muxer = {
#ifdef CONFIG_TG2_MUXER #ifdef CONFIG_TG2_MUXER
AVOutputFormat tg2_muxer = { AVOutputFormat tg2_muxer = {
"3g2", "3g2",
"3gp2 format", NULL_IF_CONFIG_SMALL("3GP2 format"),
NULL, NULL,
"3g2", "3g2",
sizeof(MOVContext), sizeof(MOVContext),
@ -1746,7 +1746,7 @@ AVOutputFormat tg2_muxer = {
#ifdef CONFIG_IPOD_MUXER #ifdef CONFIG_IPOD_MUXER
AVOutputFormat ipod_muxer = { AVOutputFormat ipod_muxer = {
"ipod", "ipod",
"iPod H.264 mp4 format", NULL_IF_CONFIG_SMALL("iPod H.264 MP4 format"),
"application/mp4", "application/mp4",
NULL, NULL,
sizeof(MOVContext), sizeof(MOVContext),

@ -646,7 +646,7 @@ static int mp3_write_trailer(struct AVFormatContext *s)
#ifdef CONFIG_MP3_DEMUXER #ifdef CONFIG_MP3_DEMUXER
AVInputFormat mp3_demuxer = { AVInputFormat mp3_demuxer = {
"mp3", "mp3",
"MPEG audio", NULL_IF_CONFIG_SMALL("MPEG audio"),
0, 0,
mp3_read_probe, mp3_read_probe,
mp3_read_header, mp3_read_header,
@ -659,7 +659,7 @@ AVInputFormat mp3_demuxer = {
#ifdef CONFIG_MP2_MUXER #ifdef CONFIG_MP2_MUXER
AVOutputFormat mp2_muxer = { AVOutputFormat mp2_muxer = {
"mp2", "mp2",
"MPEG audio layer 2", NULL_IF_CONFIG_SMALL("MPEG audio layer 2"),
"audio/x-mpeg", "audio/x-mpeg",
#ifdef CONFIG_LIBMP3LAME #ifdef CONFIG_LIBMP3LAME
"mp2,m2a", "mp2,m2a",
@ -677,7 +677,7 @@ AVOutputFormat mp2_muxer = {
#ifdef CONFIG_MP3_MUXER #ifdef CONFIG_MP3_MUXER
AVOutputFormat mp3_muxer = { AVOutputFormat mp3_muxer = {
"mp3", "mp3",
"MPEG audio layer 3", NULL_IF_CONFIG_SMALL("MPEG audio layer 3"),
"audio/x-mpeg", "audio/x-mpeg",
"mp3", "mp3",
0, 0,

@ -219,7 +219,7 @@ static int mpc_read_seek(AVFormatContext *s, int stream_index, int64_t timestamp
AVInputFormat mpc_demuxer = { AVInputFormat mpc_demuxer = {
"mpc", "mpc",
"musepack", NULL_IF_CONFIG_SMALL("Musepack"),
sizeof(MPCContext), sizeof(MPCContext),
mpc_probe, mpc_probe,
mpc_read_header, mpc_read_header,

@ -235,7 +235,7 @@ static int mpc8_read_seek(AVFormatContext *s, int stream_index, int64_t timestam
AVInputFormat mpc8_demuxer = { AVInputFormat mpc8_demuxer = {
"mpc8", "mpc8",
"musepack8", NULL_IF_CONFIG_SMALL("Musepack SV8"),
sizeof(MPCContext), sizeof(MPCContext),
mpc8_probe, mpc8_probe,
mpc8_read_header, mpc8_read_header,

@ -583,7 +583,7 @@ static int64_t mpegps_read_dts(AVFormatContext *s, int stream_index,
AVInputFormat mpegps_demuxer = { AVInputFormat mpegps_demuxer = {
"mpeg", "mpeg",
"MPEG PS format", NULL_IF_CONFIG_SMALL("MPEG-PS format"),
sizeof(MpegDemuxContext), sizeof(MpegDemuxContext),
mpegps_probe, mpegps_probe,
mpegps_read_header, mpegps_read_header,

@ -1221,7 +1221,7 @@ static int mpeg_mux_end(AVFormatContext *ctx)
#ifdef CONFIG_MPEG1SYSTEM_MUXER #ifdef CONFIG_MPEG1SYSTEM_MUXER
AVOutputFormat mpeg1system_muxer = { AVOutputFormat mpeg1system_muxer = {
"mpeg", "mpeg",
"MPEG1 System format", NULL_IF_CONFIG_SMALL("MPEG-1 System format"),
"video/mpeg", "video/mpeg",
"mpg,mpeg", "mpg,mpeg",
sizeof(MpegMuxContext), sizeof(MpegMuxContext),
@ -1235,7 +1235,7 @@ AVOutputFormat mpeg1system_muxer = {
#ifdef CONFIG_MPEG1VCD_MUXER #ifdef CONFIG_MPEG1VCD_MUXER
AVOutputFormat mpeg1vcd_muxer = { AVOutputFormat mpeg1vcd_muxer = {
"vcd", "vcd",
"MPEG1 System format (VCD)", NULL_IF_CONFIG_SMALL("MPEG-1 System format (VCD)"),
"video/mpeg", "video/mpeg",
NULL, NULL,
sizeof(MpegMuxContext), sizeof(MpegMuxContext),
@ -1249,7 +1249,7 @@ AVOutputFormat mpeg1vcd_muxer = {
#ifdef CONFIG_MPEG2VOB_MUXER #ifdef CONFIG_MPEG2VOB_MUXER
AVOutputFormat mpeg2vob_muxer = { AVOutputFormat mpeg2vob_muxer = {
"vob", "vob",
"MPEG2 PS format (VOB)", NULL_IF_CONFIG_SMALL("MPEG-2 PS format (VOB)"),
"video/mpeg", "video/mpeg",
"vob", "vob",
sizeof(MpegMuxContext), sizeof(MpegMuxContext),
@ -1265,7 +1265,7 @@ AVOutputFormat mpeg2vob_muxer = {
#ifdef CONFIG_MPEG2SVCD_MUXER #ifdef CONFIG_MPEG2SVCD_MUXER
AVOutputFormat mpeg2svcd_muxer = { AVOutputFormat mpeg2svcd_muxer = {
"svcd", "svcd",
"MPEG2 PS format (VOB)", NULL_IF_CONFIG_SMALL("MPEG-2 PS format (VOB)"),
"video/mpeg", "video/mpeg",
"vob", "vob",
sizeof(MpegMuxContext), sizeof(MpegMuxContext),
@ -1281,7 +1281,7 @@ AVOutputFormat mpeg2svcd_muxer = {
#ifdef CONFIG_MPEG2DVD_MUXER #ifdef CONFIG_MPEG2DVD_MUXER
AVOutputFormat mpeg2dvd_muxer = { AVOutputFormat mpeg2dvd_muxer = {
"dvd", "dvd",
"MPEG2 PS format (DVD VOB)", NULL_IF_CONFIG_SMALL("MPEG-2 PS format (DVD VOB)"),
"video/mpeg", "video/mpeg",
"dvd", "dvd",
sizeof(MpegMuxContext), sizeof(MpegMuxContext),

@ -1499,7 +1499,7 @@ void mpegts_parse_close(MpegTSContext *ts)
AVInputFormat mpegts_demuxer = { AVInputFormat mpegts_demuxer = {
"mpegts", "mpegts",
"MPEG2 transport stream format", NULL_IF_CONFIG_SMALL("MPEG-2 transport stream format"),
sizeof(MpegTSContext), sizeof(MpegTSContext),
mpegts_probe, mpegts_probe,
mpegts_read_header, mpegts_read_header,
@ -1512,7 +1512,7 @@ AVInputFormat mpegts_demuxer = {
AVInputFormat mpegtsraw_demuxer = { AVInputFormat mpegtsraw_demuxer = {
"mpegtsraw", "mpegtsraw",
"MPEG2 raw transport stream format", NULL_IF_CONFIG_SMALL("MPEG-2 raw transport stream format"),
sizeof(MpegTSContext), sizeof(MpegTSContext),
NULL, NULL,
mpegts_read_header, mpegts_read_header,

@ -684,7 +684,7 @@ static int mpegts_write_end(AVFormatContext *s)
AVOutputFormat mpegts_muxer = { AVOutputFormat mpegts_muxer = {
"mpegts", "mpegts",
"MPEG2 transport stream format", NULL_IF_CONFIG_SMALL("MPEG-2 transport stream format"),
"video/x-mpegts", "video/x-mpegts",
"ts,m2t", "ts,m2t",
sizeof(MpegTSWrite), sizeof(MpegTSWrite),

@ -55,7 +55,7 @@ static int mpjpeg_write_trailer(AVFormatContext *s)
AVOutputFormat mpjpeg_muxer = { AVOutputFormat mpjpeg_muxer = {
"mpjpeg", "mpjpeg",
"Mime multipart JPEG format", NULL_IF_CONFIG_SMALL("Mime multipart JPEG format"),
"multipart/x-mixed-replace;boundary=" BOUNDARY_TAG, "multipart/x-mixed-replace;boundary=" BOUNDARY_TAG,
"mjpg", "mjpg",
0, 0,

@ -132,7 +132,7 @@ static int msnwc_tcp_read_packet(AVFormatContext *ctx, AVPacket *pkt)
AVInputFormat msnwc_tcp_demuxer = { AVInputFormat msnwc_tcp_demuxer = {
"msnwctcp", "msnwctcp",
"MSN TCP Webcam stream", NULL_IF_CONFIG_SMALL("MSN TCP Webcam stream"),
0, 0,
msnwc_tcp_probe, msnwc_tcp_probe,
msnwc_tcp_read_header, msnwc_tcp_read_header,

@ -176,7 +176,7 @@ static int mtv_read_packet(AVFormatContext *s, AVPacket *pkt)
AVInputFormat mtv_demuxer = { AVInputFormat mtv_demuxer = {
"MTV", "MTV",
"MTV format", NULL_IF_CONFIG_SMALL("MTV format"),
sizeof(MTVDemuxContext), sizeof(MTVDemuxContext),
mtv_probe, mtv_probe,
mtv_read_header, mtv_read_header,

@ -1061,7 +1061,7 @@ static int mxf_read_seek(AVFormatContext *s, int stream_index, int64_t sample_ti
AVInputFormat mxf_demuxer = { AVInputFormat mxf_demuxer = {
"mxf", "mxf",
"MXF format", NULL_IF_CONFIG_SMALL("MXF format"),
sizeof(MXFContext), sizeof(MXFContext),
mxf_probe, mxf_probe,
mxf_read_header, mxf_read_header,

@ -751,7 +751,7 @@ static int nsv_probe(AVProbeData *p)
AVInputFormat nsv_demuxer = { AVInputFormat nsv_demuxer = {
"nsv", "nsv",
"NullSoft Video format", NULL_IF_CONFIG_SMALL("NullSoft Video format"),
sizeof(NSVContext), sizeof(NSVContext),
nsv_probe, nsv_probe,
nsv_read_header, nsv_read_header,

@ -908,7 +908,7 @@ static int nut_read_close(AVFormatContext *s)
#ifdef CONFIG_NUT_DEMUXER #ifdef CONFIG_NUT_DEMUXER
AVInputFormat nut_demuxer = { AVInputFormat nut_demuxer = {
"nut", "nut",
"nut format", NULL_IF_CONFIG_SMALL("NUT format"),
sizeof(NUTContext), sizeof(NUTContext),
nut_probe, nut_probe,
nut_read_header, nut_read_header,

@ -802,7 +802,7 @@ static int write_trailer(AVFormatContext *s){
AVOutputFormat nut_muxer = { AVOutputFormat nut_muxer = {
"nut", "nut",
"nut format", NULL_IF_CONFIG_SMALL("NUT format"),
"video/x-nut", "video/x-nut",
"nut", "nut",
sizeof(NUTContext), sizeof(NUTContext),

@ -242,7 +242,7 @@ static int nuv_packet(AVFormatContext *s, AVPacket *pkt) {
AVInputFormat nuv_demuxer = { AVInputFormat nuv_demuxer = {
"nuv", "nuv",
"NuppelVideo format", NULL_IF_CONFIG_SMALL("NuppelVideo format"),
sizeof(NUVContext), sizeof(NUVContext),
nuv_probe, nuv_probe,
nuv_header, nuv_header,

@ -584,7 +584,7 @@ static int ogg_probe(AVProbeData *p)
AVInputFormat ogg_demuxer = { AVInputFormat ogg_demuxer = {
"ogg", "ogg",
"Ogg", NULL_IF_CONFIG_SMALL("Ogg"),
sizeof (ogg_t), sizeof (ogg_t),
ogg_probe, ogg_probe,
ogg_read_header, ogg_read_header,

@ -279,7 +279,7 @@ static int ogg_write_trailer(AVFormatContext *s)
AVOutputFormat ogg_muxer = { AVOutputFormat ogg_muxer = {
"ogg", "ogg",
"Ogg format", NULL_IF_CONFIG_SMALL("Ogg"),
"application/ogg", "application/ogg",
"ogg", "ogg",
0, 0,

@ -351,7 +351,7 @@ static int str_read_close(AVFormatContext *s)
AVInputFormat str_demuxer = { AVInputFormat str_demuxer = {
"psxstr", "psxstr",
"Sony Playstation STR format", NULL_IF_CONFIG_SMALL("Sony Playstation STR format"),
sizeof(StrDemuxContext), sizeof(StrDemuxContext),
str_probe, str_probe,
str_read_header, str_read_header,

@ -202,7 +202,7 @@ static int64_t pva_read_timestamp(struct AVFormatContext *s, int stream_index,
AVInputFormat pva_demuxer = { AVInputFormat pva_demuxer = {
"pva", "pva",
"pva file and stream format", NULL_IF_CONFIG_SMALL("TechnoTrend PVA file and stream format"),
sizeof(PVAContext), sizeof(PVAContext),
pva_probe, pva_probe,
pva_read_header, pva_read_header,

@ -431,7 +431,7 @@ static int flac_probe(AVProbeData *p)
AVInputFormat shorten_demuxer = { AVInputFormat shorten_demuxer = {
"shn", "shn",
"raw shorten", NULL_IF_CONFIG_SMALL("raw Shorten"),
0, 0,
NULL, NULL,
audio_read_header, audio_read_header,
@ -444,7 +444,7 @@ AVInputFormat shorten_demuxer = {
AVInputFormat mlp_demuxer = { AVInputFormat mlp_demuxer = {
"mlp", "mlp",
"raw mlp", NULL_IF_CONFIG_SMALL("raw MLP"),
0, 0,
NULL, NULL,
audio_read_header, audio_read_header,
@ -457,7 +457,7 @@ AVInputFormat mlp_demuxer = {
AVInputFormat flac_demuxer = { AVInputFormat flac_demuxer = {
"flac", "flac",
"raw flac", NULL_IF_CONFIG_SMALL("raw FLAC"),
0, 0,
flac_probe, flac_probe,
audio_read_header, audio_read_header,
@ -471,7 +471,7 @@ AVInputFormat flac_demuxer = {
#ifdef CONFIG_MUXERS #ifdef CONFIG_MUXERS
AVOutputFormat flac_muxer = { AVOutputFormat flac_muxer = {
"flac", "flac",
"raw flac", NULL_IF_CONFIG_SMALL("raw FLAC"),
"audio/x-flac", "audio/x-flac",
"flac", "flac",
0, 0,
@ -486,7 +486,7 @@ AVOutputFormat flac_muxer = {
#ifdef CONFIG_AC3_DEMUXER #ifdef CONFIG_AC3_DEMUXER
AVInputFormat ac3_demuxer = { AVInputFormat ac3_demuxer = {
"ac3", "ac3",
"raw ac3", NULL_IF_CONFIG_SMALL("raw AC-3"),
0, 0,
ac3_probe, ac3_probe,
audio_read_header, audio_read_header,
@ -501,7 +501,7 @@ AVInputFormat ac3_demuxer = {
#ifdef CONFIG_MUXERS #ifdef CONFIG_MUXERS
AVOutputFormat ac3_muxer = { AVOutputFormat ac3_muxer = {
"ac3", "ac3",
"raw ac3", NULL_IF_CONFIG_SMALL("raw AC-3"),
"audio/x-ac3", "audio/x-ac3",
"ac3", "ac3",
0, 0,
@ -514,7 +514,7 @@ AVOutputFormat ac3_muxer = {
AVOutputFormat dts_muxer = { AVOutputFormat dts_muxer = {
"dts", "dts",
"raw dts", NULL_IF_CONFIG_SMALL("raw DTS"),
"audio/x-dca", "audio/x-dca",
"dts", "dts",
0, 0,
@ -529,7 +529,7 @@ AVOutputFormat dts_muxer = {
AVInputFormat dirac_demuxer = { AVInputFormat dirac_demuxer = {
"dirac", "dirac",
"raw dirac", NULL_IF_CONFIG_SMALL("raw Dirac"),
0, 0,
dirac_probe, dirac_probe,
video_read_header, video_read_header,
@ -542,7 +542,7 @@ AVInputFormat dirac_demuxer = {
#ifdef CONFIG_MUXERS #ifdef CONFIG_MUXERS
AVOutputFormat dirac_muxer = { AVOutputFormat dirac_muxer = {
"dirac", "dirac",
"raw dirac", NULL_IF_CONFIG_SMALL("raw Dirac"),
NULL, NULL,
"drc", "drc",
0, 0,
@ -556,7 +556,7 @@ AVOutputFormat dirac_muxer = {
AVInputFormat dts_demuxer = { AVInputFormat dts_demuxer = {
"dts", "dts",
"raw dts", NULL_IF_CONFIG_SMALL("raw DTS"),
0, 0,
dts_probe, dts_probe,
audio_read_header, audio_read_header,
@ -569,7 +569,7 @@ AVInputFormat dts_demuxer = {
AVInputFormat aac_demuxer = { AVInputFormat aac_demuxer = {
"aac", "aac",
"ADTS AAC", NULL_IF_CONFIG_SMALL("ADTS AAC"),
0, 0,
NULL, NULL,
audio_read_header, audio_read_header,
@ -582,7 +582,7 @@ AVInputFormat aac_demuxer = {
AVInputFormat gsm_demuxer = { AVInputFormat gsm_demuxer = {
"gsm", "gsm",
"GSM", NULL_IF_CONFIG_SMALL("GSM"),
0, 0,
NULL, NULL,
audio_read_header, audio_read_header,
@ -597,7 +597,7 @@ AVInputFormat gsm_demuxer = {
AVOutputFormat roq_muxer = AVOutputFormat roq_muxer =
{ {
"RoQ", "RoQ",
"Id RoQ format", NULL_IF_CONFIG_SMALL("Id RoQ format"),
NULL, NULL,
"roq", "roq",
0, 0,
@ -610,7 +610,7 @@ AVOutputFormat roq_muxer =
AVInputFormat h261_demuxer = { AVInputFormat h261_demuxer = {
"h261", "h261",
"raw h261", NULL_IF_CONFIG_SMALL("raw H.261"),
0, 0,
h261_probe, h261_probe,
video_read_header, video_read_header,
@ -624,7 +624,7 @@ AVInputFormat h261_demuxer = {
#ifdef CONFIG_MUXERS #ifdef CONFIG_MUXERS
AVOutputFormat h261_muxer = { AVOutputFormat h261_muxer = {
"h261", "h261",
"raw h261", NULL_IF_CONFIG_SMALL("raw H.261"),
"video/x-h261", "video/x-h261",
"h261", "h261",
0, 0,
@ -638,7 +638,7 @@ AVOutputFormat h261_muxer = {
AVInputFormat h263_demuxer = { AVInputFormat h263_demuxer = {
"h263", "h263",
"raw h263", NULL_IF_CONFIG_SMALL("raw H.263"),
0, 0,
h263_probe, h263_probe,
video_read_header, video_read_header,
@ -652,7 +652,7 @@ AVInputFormat h263_demuxer = {
#ifdef CONFIG_MUXERS #ifdef CONFIG_MUXERS
AVOutputFormat h263_muxer = { AVOutputFormat h263_muxer = {
"h263", "h263",
"raw h263", NULL_IF_CONFIG_SMALL("raw H.263"),
"video/x-h263", "video/x-h263",
"h263", "h263",
0, 0,
@ -666,7 +666,7 @@ AVOutputFormat h263_muxer = {
AVInputFormat m4v_demuxer = { AVInputFormat m4v_demuxer = {
"m4v", "m4v",
"raw MPEG4 video format", NULL_IF_CONFIG_SMALL("raw MPEG-4 video format"),
0, 0,
mpeg4video_probe, /** probing for mpeg4 data */ mpeg4video_probe, /** probing for mpeg4 data */
video_read_header, video_read_header,
@ -680,7 +680,7 @@ AVInputFormat m4v_demuxer = {
#ifdef CONFIG_MUXERS #ifdef CONFIG_MUXERS
AVOutputFormat m4v_muxer = { AVOutputFormat m4v_muxer = {
"m4v", "m4v",
"raw MPEG4 video format", NULL_IF_CONFIG_SMALL("raw MPEG-4 video format"),
NULL, NULL,
"m4v", "m4v",
0, 0,
@ -694,7 +694,7 @@ AVOutputFormat m4v_muxer = {
AVInputFormat h264_demuxer = { AVInputFormat h264_demuxer = {
"h264", "h264",
"raw H264 video format", NULL_IF_CONFIG_SMALL("raw H.264 video format"),
0, 0,
NULL /*mpegvideo_probe*/, NULL /*mpegvideo_probe*/,
video_read_header, video_read_header,
@ -708,7 +708,7 @@ AVInputFormat h264_demuxer = {
#ifdef CONFIG_MUXERS #ifdef CONFIG_MUXERS
AVOutputFormat h264_muxer = { AVOutputFormat h264_muxer = {
"h264", "h264",
"raw H264 video format", NULL_IF_CONFIG_SMALL("raw H.264 video format"),
NULL, NULL,
"h264", "h264",
0, 0,
@ -722,7 +722,7 @@ AVOutputFormat h264_muxer = {
AVInputFormat mpegvideo_demuxer = { AVInputFormat mpegvideo_demuxer = {
"mpegvideo", "mpegvideo",
"MPEG video", NULL_IF_CONFIG_SMALL("MPEG video"),
0, 0,
mpegvideo_probe, mpegvideo_probe,
video_read_header, video_read_header,
@ -735,7 +735,7 @@ AVInputFormat mpegvideo_demuxer = {
#ifdef CONFIG_MUXERS #ifdef CONFIG_MUXERS
AVOutputFormat mpeg1video_muxer = { AVOutputFormat mpeg1video_muxer = {
"mpeg1video", "mpeg1video",
"MPEG video", NULL_IF_CONFIG_SMALL("MPEG video"),
"video/x-mpeg", "video/x-mpeg",
"mpg,mpeg,m1v", "mpg,mpeg,m1v",
0, 0,
@ -750,7 +750,7 @@ AVOutputFormat mpeg1video_muxer = {
#ifdef CONFIG_MUXERS #ifdef CONFIG_MUXERS
AVOutputFormat mpeg2video_muxer = { AVOutputFormat mpeg2video_muxer = {
"mpeg2video", "mpeg2video",
"MPEG2 video", NULL_IF_CONFIG_SMALL("MPEG-2 video"),
NULL, NULL,
"m2v", "m2v",
0, 0,
@ -764,7 +764,7 @@ AVOutputFormat mpeg2video_muxer = {
AVInputFormat mjpeg_demuxer = { AVInputFormat mjpeg_demuxer = {
"mjpeg", "mjpeg",
"MJPEG video", NULL_IF_CONFIG_SMALL("MJPEG video"),
0, 0,
NULL, NULL,
video_read_header, video_read_header,
@ -777,7 +777,7 @@ AVInputFormat mjpeg_demuxer = {
AVInputFormat ingenient_demuxer = { AVInputFormat ingenient_demuxer = {
"ingenient", "ingenient",
"Ingenient MJPEG", NULL_IF_CONFIG_SMALL("Ingenient MJPEG"),
0, 0,
NULL, NULL,
video_read_header, video_read_header,
@ -791,7 +791,7 @@ AVInputFormat ingenient_demuxer = {
#ifdef CONFIG_MUXERS #ifdef CONFIG_MUXERS
AVOutputFormat mjpeg_muxer = { AVOutputFormat mjpeg_muxer = {
"mjpeg", "mjpeg",
"MJPEG video", NULL_IF_CONFIG_SMALL("MJPEG video"),
"video/x-mjpeg", "video/x-mjpeg",
"mjpg,mjpeg", "mjpg,mjpeg",
0, 0,
@ -805,7 +805,7 @@ AVOutputFormat mjpeg_muxer = {
AVInputFormat vc1_demuxer = { AVInputFormat vc1_demuxer = {
"vc1", "vc1",
"raw vc1", NULL_IF_CONFIG_SMALL("raw VC-1"),
0, 0,
NULL /* vc1_probe */, NULL /* vc1_probe */,
video_read_header, video_read_header,
@ -820,7 +820,7 @@ AVInputFormat vc1_demuxer = {
#define PCMINPUTDEF(name, long_name, ext, codec) \ #define PCMINPUTDEF(name, long_name, ext, codec) \
AVInputFormat pcm_ ## name ## _demuxer = {\ AVInputFormat pcm_ ## name ## _demuxer = {\
#name,\ #name,\
long_name,\ NULL_IF_CONFIG_SMALL(long_name),\
0,\ 0,\
NULL,\ NULL,\
raw_read_header,\ raw_read_header,\
@ -835,7 +835,7 @@ AVInputFormat pcm_ ## name ## _demuxer = {\
#define PCMOUTPUTDEF(name, long_name, ext, codec) \ #define PCMOUTPUTDEF(name, long_name, ext, codec) \
AVOutputFormat pcm_ ## name ## _muxer = {\ AVOutputFormat pcm_ ## name ## _muxer = {\
#name,\ #name,\
long_name,\ NULL_IF_CONFIG_SMALL(long_name),\
NULL,\ NULL,\
ext,\ ext,\
0,\ 0,\
@ -920,7 +920,7 @@ static int rawvideo_read_packet(AVFormatContext *s, AVPacket *pkt)
AVInputFormat rawvideo_demuxer = { AVInputFormat rawvideo_demuxer = {
"rawvideo", "rawvideo",
"raw video format", NULL_IF_CONFIG_SMALL("raw video format"),
0, 0,
NULL, NULL,
raw_read_header, raw_read_header,
@ -934,7 +934,7 @@ AVInputFormat rawvideo_demuxer = {
#ifdef CONFIG_MUXERS #ifdef CONFIG_MUXERS
AVOutputFormat rawvideo_muxer = { AVOutputFormat rawvideo_muxer = {
"rawvideo", "rawvideo",
"raw video format", NULL_IF_CONFIG_SMALL("raw video format"),
NULL, NULL,
"yuv,rgb", "yuv,rgb",
0, 0,
@ -954,7 +954,7 @@ static int null_write_packet(struct AVFormatContext *s, AVPacket *pkt)
AVOutputFormat null_muxer = { AVOutputFormat null_muxer = {
"null", "null",
"null video format", NULL_IF_CONFIG_SMALL("null video format"),
NULL, NULL,
NULL, NULL,
0, 0,

@ -288,7 +288,7 @@ static int rl2_read_seek(AVFormatContext *s, int stream_index, int64_t timestamp
AVInputFormat rl2_demuxer = { AVInputFormat rl2_demuxer = {
"rl2", "rl2",
"rl2 format", NULL_IF_CONFIG_SMALL("rl2 format"),
sizeof(Rl2DemuxContext), sizeof(Rl2DemuxContext),
rl2_probe, rl2_probe,
rl2_read_header, rl2_read_header,

@ -793,7 +793,7 @@ static int64_t rm_read_dts(AVFormatContext *s, int stream_index,
AVInputFormat rm_demuxer = { AVInputFormat rm_demuxer = {
"rm", "rm",
"rm format", NULL_IF_CONFIG_SMALL("RM format"),
sizeof(RMContext), sizeof(RMContext),
rm_probe, rm_probe,
rm_read_header, rm_read_header,

@ -432,7 +432,7 @@ static int rm_write_trailer(AVFormatContext *s)
AVOutputFormat rm_muxer = { AVOutputFormat rm_muxer = {
"rm", "rm",
"rm format", NULL_IF_CONFIG_SMALL("RM format"),
"application/vnd.rn-realmedia", "application/vnd.rn-realmedia",
"rm,ra", "rm,ra",
sizeof(RMContext), sizeof(RMContext),

@ -348,7 +348,7 @@ static int rpl_read_packet(AVFormatContext *s, AVPacket *pkt)
AVInputFormat rpl_demuxer = { AVInputFormat rpl_demuxer = {
"rpl", "rpl",
"RPL/ARMovie format", NULL_IF_CONFIG_SMALL("RPL/ARMovie format"),
sizeof(RPLContext), sizeof(RPLContext),
rpl_probe, rpl_probe,
rpl_read_header, rpl_read_header,

@ -356,7 +356,7 @@ static int rtp_write_packet(AVFormatContext *s1, AVPacket *pkt)
AVOutputFormat rtp_muxer = { AVOutputFormat rtp_muxer = {
"rtp", "rtp",
"RTP output format", NULL_IF_CONFIG_SMALL("RTP output format"),
NULL, NULL,
NULL, NULL,
sizeof(RTPDemuxContext), sizeof(RTPDemuxContext),

@ -1354,7 +1354,7 @@ static int rtsp_read_close(AVFormatContext *s)
#ifdef CONFIG_RTSP_DEMUXER #ifdef CONFIG_RTSP_DEMUXER
AVInputFormat rtsp_demuxer = { AVInputFormat rtsp_demuxer = {
"rtsp", "rtsp",
"RTSP input format", NULL_IF_CONFIG_SMALL("RTSP input format"),
sizeof(RTSPState), sizeof(RTSPState),
rtsp_probe, rtsp_probe,
rtsp_read_header, rtsp_read_header,
@ -1462,7 +1462,7 @@ static int sdp_read_close(AVFormatContext *s)
#ifdef CONFIG_SDP_DEMUXER #ifdef CONFIG_SDP_DEMUXER
AVInputFormat sdp_demuxer = { AVInputFormat sdp_demuxer = {
"sdp", "sdp",
"SDP", NULL_IF_CONFIG_SMALL("SDP"),
sizeof(RTSPState), sizeof(RTSPState),
sdp_probe, sdp_probe,
sdp_read_header, sdp_read_header,
@ -1529,7 +1529,7 @@ static int redir_read_header(AVFormatContext *s, AVFormatParameters *ap)
AVInputFormat redir_demuxer = { AVInputFormat redir_demuxer = {
"redir", "redir",
"Redirector format", NULL_IF_CONFIG_SMALL("Redirector format"),
0, 0,
redir_probe, redir_probe,
redir_read_header, redir_read_header,

@ -283,7 +283,7 @@ static int film_read_close(AVFormatContext *s)
AVInputFormat segafilm_demuxer = { AVInputFormat segafilm_demuxer = {
"film_cpk", "film_cpk",
"Sega FILM/CPK format", NULL_IF_CONFIG_SMALL("Sega FILM/CPK format"),
sizeof(FilmDemuxContext), sizeof(FilmDemuxContext),
film_probe, film_probe,
film_read_header, film_read_header,

@ -291,7 +291,7 @@ static int vmd_read_close(AVFormatContext *s)
AVInputFormat vmd_demuxer = { AVInputFormat vmd_demuxer = {
"vmd", "vmd",
"Sierra VMD format", NULL_IF_CONFIG_SMALL("Sierra VMD format"),
sizeof(VmdDemuxContext), sizeof(VmdDemuxContext),
vmd_probe, vmd_probe,
vmd_read_header, vmd_read_header,

@ -227,7 +227,7 @@ static int siff_read_packet(AVFormatContext *s, AVPacket *pkt)
AVInputFormat siff_demuxer = { AVInputFormat siff_demuxer = {
"siff", "siff",
"Beam Software SIFF", NULL_IF_CONFIG_SMALL("Beam Software SIFF"),
sizeof(SIFFContext), sizeof(SIFFContext),
siff_probe, siff_probe,
siff_read_header, siff_read_header,

@ -336,7 +336,7 @@ static int smacker_read_close(AVFormatContext *s)
AVInputFormat smacker_demuxer = { AVInputFormat smacker_demuxer = {
"smk", "smk",
"Smacker Video", NULL_IF_CONFIG_SMALL("Smacker video"),
sizeof(SmackerContext), sizeof(SmackerContext),
smacker_probe, smacker_probe,
smacker_read_header, smacker_read_header,

@ -147,7 +147,7 @@ static int sol_read_close(AVFormatContext *s)
AVInputFormat sol_demuxer = { AVInputFormat sol_demuxer = {
"sol", "sol",
"Sierra SOL Format", NULL_IF_CONFIG_SMALL("Sierra SOL format"),
0, 0,
sol_probe, sol_probe,
sol_read_header, sol_read_header,

@ -185,7 +185,7 @@ static int swf_read_packet(AVFormatContext *s, AVPacket *pkt)
AVInputFormat swf_demuxer = { AVInputFormat swf_demuxer = {
"swf", "swf",
"Flash format", NULL_IF_CONFIG_SMALL("Flash format"),
sizeof(SWFContext), sizeof(SWFContext),
swf_probe, swf_probe,
swf_read_header, swf_read_header,

@ -503,7 +503,7 @@ static int swf_write_trailer(AVFormatContext *s)
#ifdef CONFIG_SWF_MUXER #ifdef CONFIG_SWF_MUXER
AVOutputFormat swf_muxer = { AVOutputFormat swf_muxer = {
"swf", "swf",
"Flash format", NULL_IF_CONFIG_SMALL("Flash format"),
"application/x-shockwave-flash", "application/x-shockwave-flash",
"swf", "swf",
sizeof(SWFContext), sizeof(SWFContext),
@ -517,7 +517,7 @@ AVOutputFormat swf_muxer = {
#ifdef CONFIG_AVM2_MUXER #ifdef CONFIG_AVM2_MUXER
AVOutputFormat avm2_muxer = { AVOutputFormat avm2_muxer = {
"avm2", "avm2",
"Flash 9 (AVM2) format", NULL_IF_CONFIG_SMALL("Flash 9 (AVM2) format"),
"application/x-shockwave-flash", "application/x-shockwave-flash",
NULL, NULL,
sizeof(SWFContext), sizeof(SWFContext),

@ -189,7 +189,7 @@ static int thp_read_packet(AVFormatContext *s,
AVInputFormat thp_demuxer = { AVInputFormat thp_demuxer = {
"thp", "thp",
"THP", NULL_IF_CONFIG_SMALL("THP"),
sizeof(ThpDemuxContext), sizeof(ThpDemuxContext),
thp_probe, thp_probe,
thp_read_header, thp_read_header,

@ -304,7 +304,7 @@ static int seq_read_close(AVFormatContext *s)
AVInputFormat tiertexseq_demuxer = { AVInputFormat tiertexseq_demuxer = {
"tiertexseq", "tiertexseq",
"Tiertex Limited SEQ format", NULL_IF_CONFIG_SMALL("Tiertex Limited SEQ format"),
sizeof(SeqDemuxContext), sizeof(SeqDemuxContext),
seq_probe, seq_probe,
seq_read_header, seq_read_header,

@ -139,7 +139,7 @@ static int tta_read_seek(AVFormatContext *s, int stream_index, int64_t timestamp
AVInputFormat tta_demuxer = { AVInputFormat tta_demuxer = {
"tta", "tta",
"true-audio", NULL_IF_CONFIG_SMALL("True Audio"),
sizeof(TTAContext), sizeof(TTAContext),
tta_probe, tta_probe,
tta_read_header, tta_read_header,

@ -94,7 +94,7 @@ static int txd_read_close(AVFormatContext *s) {
AVInputFormat txd_demuxer = AVInputFormat txd_demuxer =
{ {
"txd", "txd",
"txd format", NULL_IF_CONFIG_SMALL("txd format"),
0, 0,
txd_probe, txd_probe,
txd_read_header, txd_read_header,

@ -103,7 +103,7 @@ static int vc1t_read_packet(AVFormatContext *s,
AVInputFormat vc1t_demuxer = { AVInputFormat vc1t_demuxer = {
"vc1test", "vc1test",
"VC1 test bitstream format", NULL_IF_CONFIG_SMALL("VC-1 test bitstream format"),
0, 0,
vc1t_probe, vc1t_probe,
vc1t_read_header, vc1t_read_header,

@ -136,7 +136,7 @@ static int voc_read_packet(AVFormatContext *s, AVPacket *pkt)
AVInputFormat voc_demuxer = { AVInputFormat voc_demuxer = {
"voc", "voc",
"Creative Voice File format", NULL_IF_CONFIG_SMALL("Creative Voice file format"),
sizeof(voc_dec_context_t), sizeof(voc_dec_context_t),
voc_probe, voc_probe,
voc_read_header, voc_read_header,

@ -90,7 +90,7 @@ static int voc_write_trailer(AVFormatContext *s)
AVOutputFormat voc_muxer = { AVOutputFormat voc_muxer = {
"voc", "voc",
"Creative Voice File format", NULL_IF_CONFIG_SMALL("Creative Voice file format"),
"audio/x-voc", "audio/x-voc",
"voc", "voc",
sizeof(voc_enc_context_t), sizeof(voc_enc_context_t),

@ -262,7 +262,7 @@ static int wav_read_seek(AVFormatContext *s,
#ifdef CONFIG_WAV_DEMUXER #ifdef CONFIG_WAV_DEMUXER
AVInputFormat wav_demuxer = { AVInputFormat wav_demuxer = {
"wav", "wav",
"wav format", NULL_IF_CONFIG_SMALL("WAV format"),
sizeof(WAVContext), sizeof(WAVContext),
wav_probe, wav_probe,
wav_read_header, wav_read_header,
@ -276,7 +276,7 @@ AVInputFormat wav_demuxer = {
#ifdef CONFIG_WAV_MUXER #ifdef CONFIG_WAV_MUXER
AVOutputFormat wav_muxer = { AVOutputFormat wav_muxer = {
"wav", "wav",
"wav format", NULL_IF_CONFIG_SMALL("WAV format"),
"audio/x-wav", "audio/x-wav",
"wav", "wav",
sizeof(WAVContext), sizeof(WAVContext),

@ -385,7 +385,7 @@ static int wc3_read_close(AVFormatContext *s)
AVInputFormat wc3_demuxer = { AVInputFormat wc3_demuxer = {
"wc3movie", "wc3movie",
"Wing Commander III movie format", NULL_IF_CONFIG_SMALL("Wing Commander III movie format"),
sizeof(Wc3DemuxContext), sizeof(Wc3DemuxContext),
wc3_probe, wc3_probe,
wc3_read_header, wc3_read_header,

@ -388,7 +388,7 @@ static int wsvqa_read_close(AVFormatContext *s)
#ifdef CONFIG_WSAUD_DEMUXER #ifdef CONFIG_WSAUD_DEMUXER
AVInputFormat wsaud_demuxer = { AVInputFormat wsaud_demuxer = {
"wsaud", "wsaud",
"Westwood Studios audio format", NULL_IF_CONFIG_SMALL("Westwood Studios audio format"),
sizeof(WsAudDemuxContext), sizeof(WsAudDemuxContext),
wsaud_probe, wsaud_probe,
wsaud_read_header, wsaud_read_header,
@ -399,7 +399,7 @@ AVInputFormat wsaud_demuxer = {
#ifdef CONFIG_WSVQA_DEMUXER #ifdef CONFIG_WSVQA_DEMUXER
AVInputFormat wsvqa_demuxer = { AVInputFormat wsvqa_demuxer = {
"wsvqa", "wsvqa",
"Westwood Studios VQA format", NULL_IF_CONFIG_SMALL("Westwood Studios VQA format"),
sizeof(WsVqaDemuxContext), sizeof(WsVqaDemuxContext),
wsvqa_probe, wsvqa_probe,
wsvqa_read_header, wsvqa_read_header,

@ -226,7 +226,7 @@ static int wv_read_seek(AVFormatContext *s, int stream_index, int64_t timestamp,
AVInputFormat wv_demuxer = { AVInputFormat wv_demuxer = {
"wv", "wv",
"WavPack", NULL_IF_CONFIG_SMALL("WavPack"),
sizeof(WVContext), sizeof(WVContext),
wv_probe, wv_probe,
wv_read_header, wv_read_header,

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

Loading…
Cancel
Save