give AVInput/OutputFormat structs consistent names

Originally committed as revision 5697 to svn://svn.ffmpeg.org/ffmpeg/trunk
pull/126/head
Måns Rullgård 19 years ago
parent 21227514de
commit d2a067d1d9
  1. 4
      ffplay.c
  2. 10
      ffserver.c
  3. 4
      libavformat/4xm.c
  4. 4
      libavformat/adtsenc.c
  5. 8
      libavformat/aiff.c
  6. 6
      libavformat/allformats.h
  7. 8
      libavformat/amr.c
  8. 4
      libavformat/asf-enc.c
  9. 12
      libavformat/asf.c
  10. 8
      libavformat/au.c
  11. 8
      libavformat/audio.c
  12. 2
      libavformat/avformat.h
  13. 4
      libavformat/avidec.c
  14. 4
      libavformat/avienc.c
  15. 4
      libavformat/avs.c
  16. 8
      libavformat/beosaudio.cpp
  17. 8
      libavformat/crc.c
  18. 4
      libavformat/daud.c
  19. 4
      libavformat/dc1394.c
  20. 8
      libavformat/dv.c
  21. 4
      libavformat/dv1394.c
  22. 4
      libavformat/electronicarts.c
  23. 8
      libavformat/ffm.c
  24. 4
      libavformat/flic.c
  25. 4
      libavformat/flvdec.c
  26. 4
      libavformat/flvenc.c
  27. 8
      libavformat/gif.c
  28. 2
      libavformat/gifdec.c
  29. 4
      libavformat/grab.c
  30. 4
      libavformat/grab_bktr.c
  31. 4
      libavformat/gxf.c
  32. 4
      libavformat/idcin.c
  33. 4
      libavformat/idroq.c
  34. 16
      libavformat/img.c
  35. 16
      libavformat/img2.c
  36. 4
      libavformat/ipmovie.c
  37. 4
      libavformat/matroska.c
  38. 4
      libavformat/mm.c
  39. 8
      libavformat/mmf.c
  40. 4
      libavformat/mov.c
  41. 20
      libavformat/movenc.c
  42. 12
      libavformat/mp3.c
  43. 46
      libavformat/mpeg.c
  44. 6
      libavformat/mpegts.c
  45. 2
      libavformat/mpegts.h
  46. 2
      libavformat/mpegtsenc.c
  47. 4
      libavformat/mpjpeg.c
  48. 4
      libavformat/nsvdec.c
  49. 8
      libavformat/nut.c
  50. 4
      libavformat/nuv.c
  51. 8
      libavformat/ogg.c
  52. 8
      libavformat/ogg2.c
  53. 4
      libavformat/psxstr.c
  54. 132
      libavformat/raw.c
  55. 8
      libavformat/rm.c
  56. 4
      libavformat/rtp.c
  57. 4
      libavformat/rtp.h
  58. 12
      libavformat/rtsp.c
  59. 2
      libavformat/rtsp.h
  60. 4
      libavformat/segafilm.c
  61. 4
      libavformat/sierravmd.c
  62. 4
      libavformat/smacker.c
  63. 4
      libavformat/sol.c
  64. 8
      libavformat/swf.c
  65. 4
      libavformat/tta.c
  66. 4
      libavformat/utils.c
  67. 4
      libavformat/v4l2.c
  68. 8
      libavformat/voc.c
  69. 8
      libavformat/wav.c
  70. 4
      libavformat/wc3movie.c
  71. 8
      libavformat/westwood.c
  72. 8
      libavformat/yuv4mpeg.c

@ -1790,7 +1790,7 @@ static int decode_thread(void *arg)
}
is->ic = ic;
#ifdef CONFIG_NETWORK
use_play = (ic->iformat == &rtsp_demux);
use_play = (ic->iformat == &rtsp_demuxer);
#else
use_play = 0;
#endif
@ -1884,7 +1884,7 @@ static int decode_thread(void *arg)
else
av_read_play(ic);
}
if (is->paused && ic->iformat == &rtsp_demux) {
if (is->paused && ic->iformat == &rtsp_demuxer) {
/* wait 10 ms to avoid trying to get another packet */
/* XXX: horrible */
SDL_Delay(10);

@ -1624,7 +1624,7 @@ static void compute_stats(HTTPContext *c)
strcpy(eosf - 4, ".asx");
} else if (strcmp(eosf - 3, ".rm") == 0) {
strcpy(eosf - 3, ".ram");
} else if (stream->fmt == &rtp_mux) {
} else if (stream->fmt == &rtp_muxer) {
/* generate a sample RTSP director if
unicast. Generate an SDP redirector if
multicast */
@ -2720,7 +2720,7 @@ static void rtsp_cmd_describe(HTTPContext *c, const char *url)
path++;
for(stream = first_stream; stream != NULL; stream = stream->next) {
if (!stream->is_feed && stream->fmt == &rtp_mux &&
if (!stream->is_feed && stream->fmt == &rtp_muxer &&
!strcmp(path, stream->filename)) {
goto found;
}
@ -2795,7 +2795,7 @@ static void rtsp_cmd_setup(HTTPContext *c, const char *url,
/* now check each stream */
for(stream = first_stream; stream != NULL; stream = stream->next) {
if (!stream->is_feed && stream->fmt == &rtp_mux) {
if (!stream->is_feed && stream->fmt == &rtp_muxer) {
/* accept aggregate filenames only if single stream */
if (!strcmp(path, stream->filename)) {
if (stream->nb_streams != 1) {
@ -3130,7 +3130,7 @@ static int rtp_new_av_stream(HTTPContext *c,
ctx = av_alloc_format_context();
if (!ctx)
return -1;
ctx->oformat = &rtp_mux;
ctx->oformat = &rtp_muxer;
st = av_mallocz(sizeof(AVStream));
if (!st)
@ -3350,7 +3350,7 @@ static void build_file_streams(void)
/* try to open the file */
/* open stream */
stream->ap_in = av_mallocz(sizeof(AVFormatParameters));
if (stream->fmt == &rtp_mux) {
if (stream->fmt == &rtp_muxer) {
/* specific case : if transport stream output to RTP,
we use a raw transport stream reader */
stream->ap_in->mpeg2ts_raw = 1;

@ -318,7 +318,7 @@ static int fourxm_read_close(AVFormatContext *s)
return 0;
}
static AVInputFormat fourxm_iformat = {
static AVInputFormat fourxm_demuxer = {
"4xm",
"4X Technologies format",
sizeof(FourxmDemuxContext),
@ -330,6 +330,6 @@ static AVInputFormat fourxm_iformat = {
int fourxm_init(void)
{
av_register_input_format(&fourxm_iformat);
av_register_input_format(&fourxm_demuxer);
return 0;
}

@ -107,7 +107,7 @@ static int adts_write_packet(AVFormatContext *s, AVPacket *pkt)
return 0;
}
static AVOutputFormat adts_oformat = {
static AVOutputFormat adts_muxer = {
"adts",
"ADTS AAC",
"audio/aac",
@ -122,6 +122,6 @@ static AVOutputFormat adts_oformat = {
int ff_adts_init(void)
{
av_register_output_format(&adts_oformat);
av_register_output_format(&adts_muxer);
return 0;
}

@ -429,7 +429,7 @@ static int aiff_read_seek(AVFormatContext *s,
}
static AVInputFormat aiff_iformat = {
static AVInputFormat aiff_demuxer = {
"aiff",
"Audio IFF",
0,
@ -441,7 +441,7 @@ static AVInputFormat aiff_iformat = {
};
#ifdef CONFIG_MUXERS
static AVOutputFormat aiff_oformat = {
static AVOutputFormat aiff_muxer = {
"aiff",
"Audio IFF",
"audio/aiff",
@ -457,9 +457,9 @@ static AVOutputFormat aiff_oformat = {
int ff_aiff_init(void)
{
av_register_input_format(&aiff_iformat);
av_register_input_format(&aiff_demuxer);
#ifdef CONFIG_MUXERS
av_register_output_format(&aiff_oformat);
av_register_output_format(&aiff_muxer);
#endif //CONFIG_MUXERS
return 0;
}

@ -2,11 +2,11 @@
#define ALLFORMATS_H
/* mpeg.c */
extern AVInputFormat mpegps_demux;
extern AVInputFormat mpegps_demuxer;
int mpegps_init(void);
/* mpegts.c */
extern AVInputFormat mpegts_demux;
extern AVInputFormat mpegts_demuxer;
int mpegts_init(void);
/* rm.c */
@ -87,7 +87,7 @@ int ff_dv_init(void);
int ffm_init(void);
/* rtsp.c */
extern AVInputFormat redir_demux;
extern AVInputFormat redir_demuxer;
int redir_open(AVFormatContext **ic_ptr, ByteIOContext *f);
/* 4xm.c */

@ -215,7 +215,7 @@ static int amr_read_close(AVFormatContext *s)
return 0;
}
static AVInputFormat amr_iformat = {
static AVInputFormat amr_demuxer = {
"amr",
"3gpp amr file format",
0, /*priv_data_size*/
@ -226,7 +226,7 @@ static AVInputFormat amr_iformat = {
};
#ifdef CONFIG_MUXERS
static AVOutputFormat amr_oformat = {
static AVOutputFormat amr_muxer = {
"amr",
"3gpp amr file format",
"audio/amr",
@ -242,9 +242,9 @@ static AVOutputFormat amr_oformat = {
int amr_init(void)
{
av_register_input_format(&amr_iformat);
av_register_input_format(&amr_demuxer);
#ifdef CONFIG_MUXERS
av_register_output_format(&amr_oformat);
av_register_output_format(&amr_muxer);
#endif
return 0;
}

@ -823,7 +823,7 @@ static int asf_write_trailer(AVFormatContext *s)
return 0;
}
AVOutputFormat asf_oformat = {
AVOutputFormat asf_muxer = {
"asf",
"asf format",
"video/x-ms-asf",
@ -841,7 +841,7 @@ AVOutputFormat asf_oformat = {
.flags = AVFMT_GLOBALHEADER,
};
AVOutputFormat asf_stream_oformat = {
AVOutputFormat asf_stream_muxer = {
"asf_stream",
"asf format",
"video/x-ms-asf",

@ -840,7 +840,7 @@ static int asf_read_seek(AVFormatContext *s, int stream_index, int64_t pts, int
return 0;
}
static AVInputFormat asf_iformat = {
static AVInputFormat asf_demuxer = {
"asf",
"asf format",
sizeof(ASFContext),
@ -853,16 +853,16 @@ static AVInputFormat asf_iformat = {
};
#ifdef CONFIG_MUXERS
extern AVOutputFormat asf_oformat;
extern AVOutputFormat asf_stream_oformat;
extern AVOutputFormat asf_muxer;
extern AVOutputFormat asf_stream_muxer;
#endif //CONFIG_MUXERS
int asf_init(void)
{
av_register_input_format(&asf_iformat);
av_register_input_format(&asf_demuxer);
#ifdef CONFIG_MUXERS
av_register_output_format(&asf_oformat);
av_register_output_format(&asf_stream_oformat);
av_register_output_format(&asf_muxer);
av_register_output_format(&asf_stream_muxer);
#endif //CONFIG_MUXERS
return 0;
}

@ -178,7 +178,7 @@ static int au_read_close(AVFormatContext *s)
return 0;
}
static AVInputFormat au_iformat = {
static AVInputFormat au_demuxer = {
"au",
"SUN AU Format",
0,
@ -190,7 +190,7 @@ static AVInputFormat au_iformat = {
};
#ifdef CONFIG_MUXERS
static AVOutputFormat au_oformat = {
static AVOutputFormat au_muxer = {
"au",
"SUN AU Format",
"audio/basic",
@ -206,9 +206,9 @@ static AVOutputFormat au_oformat = {
int au_init(void)
{
av_register_input_format(&au_iformat);
av_register_input_format(&au_demuxer);
#ifdef CONFIG_MUXERS
av_register_output_format(&au_oformat);
av_register_output_format(&au_muxer);
#endif //CONFIG_MUXERS
return 0;
}

@ -313,7 +313,7 @@ static int audio_read_close(AVFormatContext *s1)
return 0;
}
static AVInputFormat audio_in_format = {
static AVInputFormat audio_demuxer = {
"audio_device",
"audio grab and output",
sizeof(AudioData),
@ -324,7 +324,7 @@ static AVInputFormat audio_in_format = {
.flags = AVFMT_NOFILE,
};
static AVOutputFormat audio_out_format = {
static AVOutputFormat audio_muxer = {
"audio_device",
"audio grab and output",
"",
@ -347,7 +347,7 @@ static AVOutputFormat audio_out_format = {
int audio_init(void)
{
av_register_input_format(&audio_in_format);
av_register_output_format(&audio_out_format);
av_register_input_format(&audio_demuxer);
av_register_output_format(&audio_muxer);
return 0;
}

@ -399,7 +399,7 @@ extern AVImageFormat *first_image_format;
#include "rtsp.h"
/* yuv4mpeg.c */
extern AVOutputFormat yuv4mpegpipe_oformat;
extern AVOutputFormat yuv4mpegpipe_muxer;
/* utils.c */
void av_register_input_format(AVInputFormat *format);

@ -923,7 +923,7 @@ static int avi_probe(AVProbeData *p)
return 0;
}
static AVInputFormat avi_iformat = {
static AVInputFormat avi_demuxer = {
"avi",
"avi format",
sizeof(AVIContext),
@ -936,6 +936,6 @@ static AVInputFormat avi_iformat = {
int avidec_init(void)
{
av_register_input_format(&avi_iformat);
av_register_input_format(&avi_demuxer);
return 0;
}

@ -762,7 +762,7 @@ static int avi_write_trailer(AVFormatContext *s)
return res;
}
static AVOutputFormat avi_oformat = {
static AVOutputFormat avi_muxer = {
"avi",
"avi format",
"video/x-msvideo",
@ -777,7 +777,7 @@ static AVOutputFormat avi_oformat = {
int avienc_init(void)
{
av_register_output_format(&avi_oformat);
av_register_output_format(&avi_muxer);
return 0;
}
#endif //CONFIG_MUXERS

@ -217,7 +217,7 @@ static int avs_read_close(AVFormatContext * s)
return 0;
}
static AVInputFormat avs_iformat = {
static AVInputFormat avs_demuxer = {
"avs",
"avs format",
sizeof(avs_format_t),
@ -232,7 +232,7 @@ static AVInputFormat avs_iformat = {
int avs_init(void)
{
#ifdef CONFIG_DEMUXERS
av_register_input_format(&avs_iformat);
av_register_input_format(&avs_demuxer);
#endif /* CONFIG_DEMUXERS */
return 0;
}

@ -419,7 +419,7 @@ static int audio_read_close(AVFormatContext *s1)
return 0;
}
static AVInputFormat audio_in_format = {
static AVInputFormat audio_demuxer = {
"audio_device",
"audio grab and output",
sizeof(AudioData),
@ -431,7 +431,7 @@ static AVInputFormat audio_in_format = {
AVFMT_NOFILE,
};
AVOutputFormat audio_out_format = {
AVOutputFormat audio_muxer = {
"audio_device",
"audio grab and output",
"",
@ -454,8 +454,8 @@ extern "C" {
int audio_init(void)
{
main_thid = find_thread(NULL);
av_register_input_format(&audio_in_format);
av_register_output_format(&audio_out_format);
av_register_input_format(&audio_demuxer);
av_register_output_format(&audio_muxer);
return 0;
}

@ -101,7 +101,7 @@ static int framecrc_write_packet(struct AVFormatContext *s, AVPacket *pkt)
return 0;
}
static AVOutputFormat crc_format = {
static AVOutputFormat crc_muxer = {
"crc",
"crc testing format",
NULL,
@ -114,7 +114,7 @@ static AVOutputFormat crc_format = {
crc_write_trailer,
};
static AVOutputFormat framecrc_format = {
static AVOutputFormat framecrc_muxer = {
"framecrc",
"framecrc testing format",
NULL,
@ -129,8 +129,8 @@ static AVOutputFormat framecrc_format = {
int crc_init(void)
{
av_register_output_format(&crc_format);
av_register_output_format(&framecrc_format);
av_register_output_format(&crc_muxer);
av_register_output_format(&framecrc_muxer);
return 0;
}
#endif /* CONFIG_MUXERS */

@ -43,7 +43,7 @@ static int daud_packet(AVFormatContext *s, AVPacket *pkt) {
return ret;
}
static AVInputFormat daud_iformat = {
static AVInputFormat daud_demuxer = {
"daud",
"D-Cinema audio format",
0,
@ -57,7 +57,7 @@ static AVInputFormat daud_iformat = {
int daud_init(void)
{
av_register_input_format(&daud_iformat);
av_register_input_format(&daud_demuxer);
return 0;
}

@ -180,7 +180,7 @@ static int dc1394_close(AVFormatContext * context)
return 0;
}
static AVInputFormat dc1394_format = {
static AVInputFormat dc1394_demuxer = {
.name = "dc1394",
.long_name = "dc1394 A/V grab",
.priv_data_size = sizeof(struct dc1394_data),
@ -192,6 +192,6 @@ static AVInputFormat dc1394_format = {
int dc1394_init(void)
{
av_register_input_format(&dc1394_format);
av_register_input_format(&dc1394_demuxer);
return 0;
}

@ -1000,7 +1000,7 @@ static int dv_write_trailer(struct AVFormatContext *s)
}
#endif /* CONFIG_MUXERS */
static AVInputFormat dv_iformat = {
static AVInputFormat dv_demuxer = {
"dv",
"DV video format",
sizeof(RawDVContext),
@ -1013,7 +1013,7 @@ static AVInputFormat dv_iformat = {
};
#ifdef CONFIG_MUXERS
static AVOutputFormat dv_oformat = {
static AVOutputFormat dv_muxer = {
"dv",
"DV video format",
NULL,
@ -1029,9 +1029,9 @@ static AVOutputFormat dv_oformat = {
int ff_dv_init(void)
{
av_register_input_format(&dv_iformat);
av_register_input_format(&dv_demuxer);
#ifdef CONFIG_MUXERS
av_register_output_format(&dv_oformat);
av_register_output_format(&dv_muxer);
#endif
return 0;
}

@ -227,7 +227,7 @@ static int dv1394_close(AVFormatContext * context)
return 0;
}
static AVInputFormat dv1394_format = {
static AVInputFormat dv1394_demuxer = {
.name = "dv1394",
.long_name = "dv1394 A/V grab",
.priv_data_size = sizeof(struct dv1394_data),
@ -239,6 +239,6 @@ static AVInputFormat dv1394_format = {
int dv1394_init(void)
{
av_register_input_format(&dv1394_format);
av_register_input_format(&dv1394_demuxer);
return 0;
}

@ -278,7 +278,7 @@ static int ea_read_close(AVFormatContext *s)
return 0;
}
static AVInputFormat ea_iformat = {
static AVInputFormat ea_demuxer = {
"ea",
"Electronic Arts Multimedia Format",
sizeof(EaDemuxContext),
@ -290,6 +290,6 @@ static AVInputFormat ea_iformat = {
int ea_init(void)
{
av_register_input_format(&ea_iformat);
av_register_input_format(&ea_demuxer);
return 0;
}

@ -761,7 +761,7 @@ static int ffm_probe(AVProbeData *p)
return 0;
}
static AVInputFormat ffm_iformat = {
static AVInputFormat ffm_demuxer = {
"ffm",
"ffm format",
sizeof(FFMContext),
@ -773,7 +773,7 @@ static AVInputFormat ffm_iformat = {
};
#ifdef CONFIG_MUXERS
static AVOutputFormat ffm_oformat = {
static AVOutputFormat ffm_muxer = {
"ffm",
"ffm format",
"",
@ -790,9 +790,9 @@ static AVOutputFormat ffm_oformat = {
int ffm_init(void)
{
av_register_input_format(&ffm_iformat);
av_register_input_format(&ffm_demuxer);
#ifdef CONFIG_MUXERS
av_register_output_format(&ffm_oformat);
av_register_output_format(&ffm_muxer);
#endif //CONFIG_MUXERS
return 0;
}

@ -208,7 +208,7 @@ static int flic_read_close(AVFormatContext *s)
return 0;
}
static AVInputFormat flic_iformat = {
static AVInputFormat flic_demuxer = {
"flic",
"FLI/FLC/FLX animation format",
sizeof(FlicDemuxContext),
@ -220,6 +220,6 @@ static AVInputFormat flic_iformat = {
int flic_init(void)
{
av_register_input_format(&flic_iformat);
av_register_input_format(&flic_demuxer);
return 0;
}

@ -211,7 +211,7 @@ static int flv_read_close(AVFormatContext *s)
return 0;
}
AVInputFormat flv_iformat = {
AVInputFormat flv_demuxer = {
"flv",
"flv format",
0,
@ -225,6 +225,6 @@ AVInputFormat flv_iformat = {
int flvdec_init(void)
{
av_register_input_format(&flv_iformat);
av_register_input_format(&flv_demuxer);
return 0;
}

@ -167,7 +167,7 @@ static int flv_write_packet(AVFormatContext *s, AVPacket *pkt)
return 0;
}
static AVOutputFormat flv_oformat = {
static AVOutputFormat flv_muxer = {
"flv",
"flv format",
"video/x-flv",
@ -186,6 +186,6 @@ static AVOutputFormat flv_oformat = {
int flvenc_init(void)
{
av_register_output_format(&flv_oformat);
av_register_output_format(&flv_muxer);
return 0;
}

@ -414,7 +414,7 @@ int gif_write(ByteIOContext *pb, AVImageInfo *info)
return 0;
}
static AVOutputFormat gif_oformat = {
static AVOutputFormat gif_muxer = {
"gif",
"GIF Animation",
"image/gif",
@ -427,11 +427,11 @@ static AVOutputFormat gif_oformat = {
gif_write_trailer,
};
extern AVInputFormat gif_iformat;
extern AVInputFormat gif_demuxer;
int gif_init(void)
{
av_register_output_format(&gif_oformat);
av_register_input_format(&gif_iformat);
av_register_output_format(&gif_muxer);
av_register_input_format(&gif_demuxer);
return 0;
}

@ -619,7 +619,7 @@ static int gif_read(ByteIOContext *f,
return 0;
}
AVInputFormat gif_iformat =
AVInputFormat gif_demuxer =
{
"gif",
"gif format",

@ -365,7 +365,7 @@ static int grab_read_close(AVFormatContext *s1)
return 0;
}
static AVInputFormat video_grab_device_format = {
static AVInputFormat video_grab_device_demuxer = {
"video4linux",
"video grab",
sizeof(VideoData),
@ -851,6 +851,6 @@ static int aiw_close(VideoData *s)
int video_grab_init(void)
{
av_register_input_format(&video_grab_device_format);
av_register_input_format(&video_grab_device_demuxer);
return 0;
}

@ -316,7 +316,7 @@ static int grab_read_close(AVFormatContext *s1)
return 0;
}
AVInputFormat video_grab_device_format = {
AVInputFormat video_grab_device_demuxer = {
"bktr",
"video grab",
sizeof(VideoData),
@ -329,6 +329,6 @@ AVInputFormat video_grab_device_format = {
int video_grab_init(void)
{
av_register_input_format(&video_grab_device_format);
av_register_input_format(&video_grab_device_demuxer);
return 0;
}

@ -241,7 +241,7 @@ static int gxf_packet(AVFormatContext *s, AVPacket *pkt) {
return AVERROR_IO;
}
static AVInputFormat gxf_iformat = {
static AVInputFormat gxf_demuxer = {
"gxf",
"GXF format",
0,
@ -253,7 +253,7 @@ static AVInputFormat gxf_iformat = {
};
int gxf_init(void) {
av_register_input_format(&gxf_iformat);
av_register_input_format(&gxf_demuxer);
return 0;
}

@ -288,7 +288,7 @@ static int idcin_read_close(AVFormatContext *s)
return 0;
}
static AVInputFormat idcin_iformat = {
static AVInputFormat idcin_demuxer = {
"idcin",
"Id CIN format",
sizeof(IdcinDemuxContext),
@ -300,6 +300,6 @@ static AVInputFormat idcin_iformat = {
int idcin_init(void)
{
av_register_input_format(&idcin_iformat);
av_register_input_format(&idcin_demuxer);
return 0;
}

@ -278,7 +278,7 @@ static int roq_read_close(AVFormatContext *s)
return 0;
}
static AVInputFormat roq_iformat = {
static AVInputFormat roq_demuxer = {
"RoQ",
"Id RoQ format",
sizeof(RoqDemuxContext),
@ -290,6 +290,6 @@ static AVInputFormat roq_iformat = {
int roq_init(void)
{
av_register_input_format(&roq_iformat);
av_register_input_format(&roq_demuxer);
return 0;
}

@ -340,7 +340,7 @@ static int img_write_trailer(AVFormatContext *s)
/* input */
static AVInputFormat image_iformat = {
static AVInputFormat image_demuxer = {
"image",
"image sequence",
sizeof(VideoData),
@ -353,7 +353,7 @@ static AVInputFormat image_iformat = {
AVFMT_NOFILE | AVFMT_NEEDNUMBER,
};
static AVInputFormat imagepipe_iformat = {
static AVInputFormat imagepipe_demuxer = {
"imagepipe",
"piped image sequence",
sizeof(VideoData),
@ -367,7 +367,7 @@ static AVInputFormat imagepipe_iformat = {
/* output */
static AVOutputFormat image_oformat = {
static AVOutputFormat image_muxer = {
"image",
"image sequence",
"",
@ -382,7 +382,7 @@ static AVOutputFormat image_oformat = {
img_set_parameters,
};
static AVOutputFormat imagepipe_oformat = {
static AVOutputFormat imagepipe_muxer = {
"imagepipe",
"piped image sequence",
"",
@ -399,11 +399,11 @@ static AVOutputFormat imagepipe_oformat = {
int img_init(void)
{
av_register_input_format(&image_iformat);
av_register_output_format(&image_oformat);
av_register_input_format(&image_demuxer);
av_register_output_format(&image_muxer);
av_register_input_format(&imagepipe_iformat);
av_register_output_format(&imagepipe_oformat);
av_register_input_format(&imagepipe_demuxer);
av_register_output_format(&imagepipe_muxer);
return 0;
}

@ -365,7 +365,7 @@ static int img_write_trailer(AVFormatContext *s)
/* input */
static AVInputFormat image2_iformat = {
static AVInputFormat image2_demuxer = {
"image2",
"image2 sequence",
sizeof(VideoData),
@ -378,7 +378,7 @@ static AVInputFormat image2_iformat = {
AVFMT_NOFILE,
};
static AVInputFormat image2pipe_iformat = {
static AVInputFormat image2pipe_demuxer = {
"image2pipe",
"piped image2 sequence",
sizeof(VideoData),
@ -393,7 +393,7 @@ static AVInputFormat image2pipe_iformat = {
#ifdef CONFIG_MUXERS
/* output */
static AVOutputFormat image2_oformat = {
static AVOutputFormat image2_muxer = {
"image2",
"image2 sequence",
"",
@ -407,7 +407,7 @@ static AVOutputFormat image2_oformat = {
AVFMT_NOFILE,
};
static AVOutputFormat image2pipe_oformat = {
static AVOutputFormat image2pipe_muxer = {
"image2pipe",
"piped image2 sequence",
"",
@ -423,12 +423,12 @@ static AVOutputFormat image2pipe_oformat = {
int img2_init(void)
{
av_register_input_format(&image2_iformat);
av_register_input_format(&image2pipe_iformat);
av_register_input_format(&image2_demuxer);
av_register_input_format(&image2pipe_demuxer);
#ifdef CONFIG_MUXERS
av_register_output_format(&image2_oformat);
av_register_output_format(&image2pipe_oformat);
av_register_output_format(&image2_muxer);
av_register_output_format(&image2pipe_muxer);
#endif
return 0;

@ -612,7 +612,7 @@ static int ipmovie_read_close(AVFormatContext *s)
return 0;
}
static AVInputFormat ipmovie_iformat = {
static AVInputFormat ipmovie_demuxer = {
"ipmovie",
"Interplay MVE format",
sizeof(IPMVEContext),
@ -624,7 +624,7 @@ static AVInputFormat ipmovie_iformat = {
int ipmovie_init(void)
{
av_register_input_format(&ipmovie_iformat);
av_register_input_format(&ipmovie_demuxer);
return 0;
}

@ -2635,7 +2635,7 @@ matroska_read_close (AVFormatContext *s)
return 0;
}
static AVInputFormat matroska_iformat = {
static AVInputFormat matroska_demuxer = {
"matroska",
"Matroska file format",
sizeof(MatroskaDemuxContext),
@ -2648,6 +2648,6 @@ static AVInputFormat matroska_iformat = {
int
matroska_init(void)
{
av_register_input_format(&matroska_iformat);
av_register_input_format(&matroska_demuxer);
return 0;
}

@ -199,7 +199,7 @@ static int mm_read_close(AVFormatContext *s)
return 0;
}
static AVInputFormat mm_iformat = {
static AVInputFormat mm_demuxer = {
"mm",
"American Laser Games MM format",
sizeof(MmDemuxContext),
@ -211,6 +211,6 @@ static AVInputFormat mm_iformat = {
int mm_init(void)
{
av_register_input_format(&mm_iformat);
av_register_input_format(&mm_demuxer);
return 0;
}

@ -302,7 +302,7 @@ static int mmf_read_seek(AVFormatContext *s,
}
static AVInputFormat mmf_iformat = {
static AVInputFormat mmf_demuxer = {
"mmf",
"mmf format",
sizeof(MMFContext),
@ -314,7 +314,7 @@ static AVInputFormat mmf_iformat = {
};
#ifdef CONFIG_MUXERS
static AVOutputFormat mmf_oformat = {
static AVOutputFormat mmf_muxer = {
"mmf",
"mmf format",
"application/vnd.smaf",
@ -330,9 +330,9 @@ static AVOutputFormat mmf_oformat = {
int ff_mmf_init(void)
{
av_register_input_format(&mmf_iformat);
av_register_input_format(&mmf_demuxer);
#ifdef CONFIG_MUXERS
av_register_output_format(&mmf_oformat);
av_register_output_format(&mmf_muxer);
#endif //CONFIG_MUXERS
return 0;
}

@ -1907,7 +1907,7 @@ static int mov_read_close(AVFormatContext *s)
return 0;
}
static AVInputFormat mov_iformat = {
static AVInputFormat mov_demuxer = {
"mov,mp4,m4a,3gp,3g2,mj2",
"QuickTime/MPEG4/Motion JPEG 2000 format",
sizeof(MOVContext),
@ -1920,6 +1920,6 @@ static AVInputFormat mov_iformat = {
int mov_init(void)
{
av_register_input_format(&mov_iformat);
av_register_input_format(&mov_demuxer);
return 0;
}

@ -1588,7 +1588,7 @@ static int mov_write_trailer(AVFormatContext *s)
return res;
}
static AVOutputFormat mov_oformat = {
static AVOutputFormat mov_muxer = {
"mov",
"mov format",
NULL,
@ -1602,7 +1602,7 @@ static AVOutputFormat mov_oformat = {
.flags = AVFMT_GLOBALHEADER,
};
static AVOutputFormat _3gp_oformat = {
static AVOutputFormat _3gp_muxer = {
"3gp",
"3gp format",
NULL,
@ -1616,7 +1616,7 @@ static AVOutputFormat _3gp_oformat = {
.flags = AVFMT_GLOBALHEADER,
};
static AVOutputFormat mp4_oformat = {
static AVOutputFormat mp4_muxer = {
"mp4",
"mp4 format",
"application/mp4",
@ -1630,7 +1630,7 @@ static AVOutputFormat mp4_oformat = {
.flags = AVFMT_GLOBALHEADER,
};
static AVOutputFormat psp_oformat = {
static AVOutputFormat psp_muxer = {
"psp",
"psp mp4 format",
NULL,
@ -1644,7 +1644,7 @@ static AVOutputFormat psp_oformat = {
.flags = AVFMT_GLOBALHEADER,
};
static AVOutputFormat _3g2_oformat = {
static AVOutputFormat _3g2_muxer = {
"3g2",
"3gp2 format",
NULL,
@ -1660,10 +1660,10 @@ static AVOutputFormat _3g2_oformat = {
int movenc_init(void)
{
av_register_output_format(&mov_oformat);
av_register_output_format(&_3gp_oformat);
av_register_output_format(&mp4_oformat);
av_register_output_format(&psp_oformat);
av_register_output_format(&_3g2_oformat);
av_register_output_format(&mov_muxer);
av_register_output_format(&_3gp_muxer);
av_register_output_format(&mp4_muxer);
av_register_output_format(&psp_muxer);
av_register_output_format(&_3g2_muxer);
return 0;
}

@ -368,7 +368,7 @@ static int mp3_write_trailer(struct AVFormatContext *s)
}
#endif //CONFIG_MUXERS
AVInputFormat mp3_iformat = {
AVInputFormat mp3_demuxer = {
"mp3",
"MPEG audio",
0,
@ -380,7 +380,7 @@ AVInputFormat mp3_iformat = {
};
#ifdef CONFIG_MUXERS
AVOutputFormat mp2_oformat = {
AVOutputFormat mp2_muxer = {
"mp2",
"MPEG audio layer 2",
"audio/x-mpeg",
@ -398,7 +398,7 @@ AVOutputFormat mp2_oformat = {
};
#ifdef CONFIG_MP3LAME
AVOutputFormat mp3_oformat = {
AVOutputFormat mp3_muxer = {
"mp3",
"MPEG audio layer 3",
"audio/x-mpeg",
@ -415,11 +415,11 @@ AVOutputFormat mp3_oformat = {
int mp3_init(void)
{
av_register_input_format(&mp3_iformat);
av_register_input_format(&mp3_demuxer);
#ifdef CONFIG_MUXERS
av_register_output_format(&mp2_oformat);
av_register_output_format(&mp2_muxer);
#ifdef CONFIG_MP3LAME
av_register_output_format(&mp3_oformat);
av_register_output_format(&mp3_muxer);
#endif
#endif //CONFIG_MUXERS
return 0;

@ -108,11 +108,11 @@ typedef struct {
static const int lpcm_freq_tab[4] = { 48000, 96000, 44100, 32000 };
#ifdef CONFIG_MUXERS
static AVOutputFormat mpeg1system_mux;
static AVOutputFormat mpeg1vcd_mux;
static AVOutputFormat mpeg2vob_mux;
static AVOutputFormat mpeg2svcd_mux;
static AVOutputFormat mpeg2dvd_mux;
static AVOutputFormat mpeg1system_muxer;
static AVOutputFormat mpeg1vcd_muxer;
static AVOutputFormat mpeg2vob_muxer;
static AVOutputFormat mpeg2svcd_muxer;
static AVOutputFormat mpeg2dvd_muxer;
static int put_pack_header(AVFormatContext *ctx,
uint8_t *buf, int64_t timestamp)
@ -330,10 +330,10 @@ static int mpeg_mux_init(AVFormatContext *ctx)
int video_bitrate;
s->packet_number = 0;
s->is_vcd = (ctx->oformat == &mpeg1vcd_mux);
s->is_svcd = (ctx->oformat == &mpeg2svcd_mux);
s->is_mpeg2 = (ctx->oformat == &mpeg2vob_mux || ctx->oformat == &mpeg2svcd_mux || ctx->oformat == &mpeg2dvd_mux);
s->is_dvd = (ctx->oformat == &mpeg2dvd_mux);
s->is_vcd = (ctx->oformat == &mpeg1vcd_muxer);
s->is_svcd = (ctx->oformat == &mpeg2svcd_muxer);
s->is_mpeg2 = (ctx->oformat == &mpeg2vob_muxer || ctx->oformat == &mpeg2svcd_muxer || ctx->oformat == &mpeg2dvd_muxer);
s->is_dvd = (ctx->oformat == &mpeg2dvd_muxer);
if(ctx->packet_size)
s->packet_size = ctx->packet_size;
@ -1713,7 +1713,7 @@ static int64_t mpegps_read_dts(AVFormatContext *s, int stream_index,
}
#ifdef CONFIG_MUXERS
static AVOutputFormat mpeg1system_mux = {
static AVOutputFormat mpeg1system_muxer = {
"mpeg",
"MPEG1 System format",
"video/mpeg",
@ -1726,7 +1726,7 @@ static AVOutputFormat mpeg1system_mux = {
mpeg_mux_end,
};
static AVOutputFormat mpeg1vcd_mux = {
static AVOutputFormat mpeg1vcd_muxer = {
"vcd",
"MPEG1 System format (VCD)",
"video/mpeg",
@ -1739,7 +1739,7 @@ static AVOutputFormat mpeg1vcd_mux = {
mpeg_mux_end,
};
static AVOutputFormat mpeg2vob_mux = {
static AVOutputFormat mpeg2vob_muxer = {
"vob",
"MPEG2 PS format (VOB)",
"video/mpeg",
@ -1752,8 +1752,8 @@ static AVOutputFormat mpeg2vob_mux = {
mpeg_mux_end,
};
/* Same as mpeg2vob_mux except that the pack size is 2324 */
static AVOutputFormat mpeg2svcd_mux = {
/* Same as mpeg2vob_muxer except that the pack size is 2324 */
static AVOutputFormat mpeg2svcd_muxer = {
"svcd",
"MPEG2 PS format (VOB)",
"video/mpeg",
@ -1766,8 +1766,8 @@ static AVOutputFormat mpeg2svcd_mux = {
mpeg_mux_end,
};
/* Same as mpeg2vob_mux except the 'is_dvd' flag is set to produce NAV pkts */
static AVOutputFormat mpeg2dvd_mux = {
/* Same as mpeg2vob_muxer except the 'is_dvd' flag is set to produce NAV pkts */
static AVOutputFormat mpeg2dvd_muxer = {
"dvd",
"MPEG2 PS format (DVD VOB)",
"video/mpeg",
@ -1782,7 +1782,7 @@ static AVOutputFormat mpeg2dvd_mux = {
#endif //CONFIG_MUXERS
AVInputFormat mpegps_demux = {
AVInputFormat mpegps_demuxer = {
"mpeg",
"MPEG PS format",
sizeof(MpegDemuxContext),
@ -1798,12 +1798,12 @@ AVInputFormat mpegps_demux = {
int mpegps_init(void)
{
#ifdef CONFIG_MUXERS
av_register_output_format(&mpeg1system_mux);
av_register_output_format(&mpeg1vcd_mux);
av_register_output_format(&mpeg2vob_mux);
av_register_output_format(&mpeg2svcd_mux);
av_register_output_format(&mpeg2dvd_mux);
av_register_output_format(&mpeg1system_muxer);
av_register_output_format(&mpeg1vcd_muxer);
av_register_output_format(&mpeg2vob_muxer);
av_register_output_format(&mpeg2svcd_muxer);
av_register_output_format(&mpeg2dvd_muxer);
#endif //CONFIG_MUXERS
av_register_input_format(&mpegps_demux);
av_register_input_format(&mpegps_demuxer);
return 0;
}

@ -1511,7 +1511,7 @@ void mpegts_parse_close(MpegTSContext *ts)
av_free(ts);
}
AVInputFormat mpegts_demux = {
AVInputFormat mpegts_demuxer = {
"mpegts",
"MPEG2 transport stream format",
sizeof(MpegTSContext),
@ -1526,9 +1526,9 @@ AVInputFormat mpegts_demux = {
int mpegts_init(void)
{
av_register_input_format(&mpegts_demux);
av_register_input_format(&mpegts_demuxer);
#ifdef CONFIG_MUXERS
av_register_output_format(&mpegts_mux);
av_register_output_format(&mpegts_muxer);
#endif
return 0;
}

@ -51,7 +51,7 @@
#define STREAM_TYPE_SUBTITLE_DVB 0x100
unsigned int mpegts_crc32(const uint8_t *data, int len);
extern AVOutputFormat mpegts_mux;
extern AVOutputFormat mpegts_muxer;
typedef struct MpegTSContext MpegTSContext;

@ -661,7 +661,7 @@ static int mpegts_write_end(AVFormatContext *s)
return 0;
}
AVOutputFormat mpegts_mux = {
AVOutputFormat mpegts_muxer = {
"mpegts",
"MPEG2 transport stream format",
"video/x-mpegts",

@ -52,7 +52,7 @@ static int mpjpeg_write_trailer(AVFormatContext *s)
return 0;
}
static AVOutputFormat mpjpeg_format = {
static AVOutputFormat mpjpeg_muxer = {
"mpjpeg",
"Mime multipart JPEG format",
"multipart/x-mixed-replace;boundary=" BOUNDARY_TAG,
@ -67,7 +67,7 @@ static AVOutputFormat mpjpeg_format = {
int jpeg_init(void)
{
av_register_output_format(&mpjpeg_format);
av_register_output_format(&mpjpeg_muxer);
return 0;
}
#endif //CONFIG_MUXERS

@ -742,7 +742,7 @@ static int nsv_probe(AVProbeData *p)
return 0;
}
static AVInputFormat nsv_iformat = {
static AVInputFormat nsv_demuxer = {
"nsv",
"NullSoft Video format",
sizeof(NSVContext),
@ -755,6 +755,6 @@ static AVInputFormat nsv_iformat = {
int nsvdec_init(void)
{
av_register_input_format(&nsv_iformat);
av_register_input_format(&nsv_demuxer);
return 0;
}

@ -1419,7 +1419,7 @@ static int nut_read_close(AVFormatContext *s)
return 0;
}
static AVInputFormat nut_iformat = {
static AVInputFormat nut_demuxer = {
"nut",
"nut format",
sizeof(NUTContext),
@ -1433,7 +1433,7 @@ static AVInputFormat nut_iformat = {
};
#ifdef CONFIG_MUXERS
static AVOutputFormat nut_oformat = {
static AVOutputFormat nut_muxer = {
"nut",
"nut format",
"video/x-nut",
@ -1456,9 +1456,9 @@ static AVOutputFormat nut_oformat = {
int nut_init(void)
{
av_register_input_format(&nut_iformat);
av_register_input_format(&nut_demuxer);
#ifdef CONFIG_MUXERS
av_register_output_format(&nut_oformat);
av_register_output_format(&nut_muxer);
#endif //CONFIG_MUXERS
return 0;
}

@ -227,7 +227,7 @@ static int nuv_packet(AVFormatContext *s, AVPacket *pkt) {
return AVERROR_IO;
}
static AVInputFormat nuv_iformat = {
static AVInputFormat nuv_demuxer = {
"nuv",
"NuppelVideo format",
sizeof(NUVContext),
@ -239,7 +239,7 @@ static AVInputFormat nuv_iformat = {
};
int nuv_init(void) {
av_register_input_format(&nuv_iformat);
av_register_input_format(&nuv_demuxer);
return 0;
}

@ -137,7 +137,7 @@ static int ogg_write_trailer(AVFormatContext *avfcontext) {
}
static AVOutputFormat ogg_oformat = {
static AVOutputFormat ogg_muxer = {
"ogg",
"Ogg Vorbis",
"audio/x-vorbis",
@ -254,7 +254,7 @@ static int ogg_read_close(AVFormatContext *avfcontext) {
}
static AVInputFormat ogg_iformat = {
static AVInputFormat ogg_demuxer = {
"ogg",
"Ogg Vorbis",
sizeof(OggContext),
@ -268,8 +268,8 @@ static AVInputFormat ogg_iformat = {
int libogg_init(void) {
#ifdef CONFIG_MUXERS
av_register_output_format(&ogg_oformat) ;
av_register_output_format(&ogg_muxer) ;
#endif
/* av_register_input_format(&ogg_iformat); */
/* av_register_input_format(&ogg_demuxer); */
return 0 ;
}

@ -65,7 +65,7 @@ ogg_write_trailer (AVFormatContext * avfcontext)
}
static AVOutputFormat ogg_oformat = {
static AVOutputFormat ogg_muxer = {
"ogg",
"Ogg Vorbis",
"audio/x-vorbis",
@ -656,7 +656,7 @@ static int ogg_probe(AVProbeData *p)
return 0;
}
static AVInputFormat ogg_iformat = {
static AVInputFormat ogg_demuxer = {
"ogg",
"Ogg",
sizeof (ogg_t),
@ -673,8 +673,8 @@ int
ogg_init (void)
{
#if 0 // CONFIG_MUXERS
av_register_output_format (&ogg_oformat);
av_register_output_format (&ogg_muxer);
#endif
av_register_input_format (&ogg_iformat);
av_register_input_format (&ogg_demuxer);
return 0;
}

@ -351,7 +351,7 @@ static int str_read_close(AVFormatContext *s)
return 0;
}
static AVInputFormat str_iformat = {
static AVInputFormat str_demuxer = {
"psxstr",
"Sony Playstation STR format",
sizeof(StrDemuxContext),
@ -363,6 +363,6 @@ static AVInputFormat str_iformat = {
int str_init(void)
{
av_register_input_format(&str_iformat);
av_register_input_format(&str_demuxer);
return 0;
}

@ -389,7 +389,7 @@ static int h261_probe(AVProbeData *p)
return 0;
}
AVInputFormat shorten_iformat = {
AVInputFormat shorten_demuxer = {
"shn",
"raw shorten",
0,
@ -400,7 +400,7 @@ AVInputFormat shorten_iformat = {
.extensions = "shn",
};
AVInputFormat flac_iformat = {
AVInputFormat flac_demuxer = {
"flac",
"raw flac",
0,
@ -412,7 +412,7 @@ AVInputFormat flac_iformat = {
};
#ifdef CONFIG_MUXERS
AVOutputFormat flac_oformat = {
AVOutputFormat flac_muxer = {
"flac",
"raw flac",
"audio/x-flac",
@ -426,7 +426,7 @@ AVOutputFormat flac_oformat = {
};
#endif //CONFIG_MUXERS
AVInputFormat ac3_iformat = {
AVInputFormat ac3_demuxer = {
"ac3",
"raw ac3",
0,
@ -438,7 +438,7 @@ AVInputFormat ac3_iformat = {
};
#ifdef CONFIG_MUXERS
AVOutputFormat ac3_oformat = {
AVOutputFormat ac3_muxer = {
"ac3",
"raw ac3",
"audio/x-ac3",
@ -452,7 +452,7 @@ AVOutputFormat ac3_oformat = {
};
#endif //CONFIG_MUXERS
AVInputFormat dts_iformat = {
AVInputFormat dts_demuxer = {
"dts",
"raw dts",
0,
@ -463,7 +463,7 @@ AVInputFormat dts_iformat = {
.extensions = "dts",
};
AVInputFormat aac_iformat = {
AVInputFormat aac_demuxer = {
"aac",
"ADTS AAC",
0,
@ -474,7 +474,7 @@ AVInputFormat aac_iformat = {
.extensions = "aac",
};
AVInputFormat h261_iformat = {
AVInputFormat h261_demuxer = {
"h261",
"raw h261",
0,
@ -487,7 +487,7 @@ AVInputFormat h261_iformat = {
};
#ifdef CONFIG_MUXERS
AVOutputFormat h261_oformat = {
AVOutputFormat h261_muxer = {
"h261",
"raw h261",
"video/x-h261",
@ -501,7 +501,7 @@ AVOutputFormat h261_oformat = {
};
#endif //CONFIG_MUXERS
AVInputFormat h263_iformat = {
AVInputFormat h263_demuxer = {
"h263",
"raw h263",
0,
@ -514,7 +514,7 @@ AVInputFormat h263_iformat = {
};
#ifdef CONFIG_MUXERS
AVOutputFormat h263_oformat = {
AVOutputFormat h263_muxer = {
"h263",
"raw h263",
"video/x-h263",
@ -528,7 +528,7 @@ AVOutputFormat h263_oformat = {
};
#endif //CONFIG_MUXERS
AVInputFormat m4v_iformat = {
AVInputFormat m4v_demuxer = {
"m4v",
"raw MPEG4 video format",
0,
@ -541,7 +541,7 @@ AVInputFormat m4v_iformat = {
};
#ifdef CONFIG_MUXERS
AVOutputFormat m4v_oformat = {
AVOutputFormat m4v_muxer = {
"m4v",
"raw MPEG4 video format",
NULL,
@ -555,7 +555,7 @@ AVOutputFormat m4v_oformat = {
};
#endif //CONFIG_MUXERS
AVInputFormat h264_iformat = {
AVInputFormat h264_demuxer = {
"h264",
"raw H264 video format",
0,
@ -568,7 +568,7 @@ AVInputFormat h264_iformat = {
};
#ifdef CONFIG_MUXERS
AVOutputFormat h264_oformat = {
AVOutputFormat h264_muxer = {
"h264",
"raw H264 video format",
NULL,
@ -582,7 +582,7 @@ AVOutputFormat h264_oformat = {
};
#endif //CONFIG_MUXERS
AVInputFormat mpegvideo_iformat = {
AVInputFormat mpegvideo_demuxer = {
"mpegvideo",
"MPEG video",
0,
@ -594,7 +594,7 @@ AVInputFormat mpegvideo_iformat = {
};
#ifdef CONFIG_MUXERS
AVOutputFormat mpeg1video_oformat = {
AVOutputFormat mpeg1video_muxer = {
"mpeg1video",
"MPEG video",
"video/x-mpeg",
@ -609,7 +609,7 @@ AVOutputFormat mpeg1video_oformat = {
#endif //CONFIG_MUXERS
#ifdef CONFIG_MUXERS
AVOutputFormat mpeg2video_oformat = {
AVOutputFormat mpeg2video_muxer = {
"mpeg2video",
"MPEG2 video",
NULL,
@ -623,7 +623,7 @@ AVOutputFormat mpeg2video_oformat = {
};
#endif //CONFIG_MUXERS
AVInputFormat mjpeg_iformat = {
AVInputFormat mjpeg_demuxer = {
"mjpeg",
"MJPEG video",
0,
@ -635,7 +635,7 @@ AVInputFormat mjpeg_iformat = {
.value = CODEC_ID_MJPEG,
};
AVInputFormat ingenient_iformat = {
AVInputFormat ingenient_demuxer = {
"ingenient",
"Ingenient MJPEG",
0,
@ -648,7 +648,7 @@ AVInputFormat ingenient_iformat = {
};
#ifdef CONFIG_MUXERS
AVOutputFormat mjpeg_oformat = {
AVOutputFormat mjpeg_muxer = {
"mjpeg",
"MJPEG video",
"video/x-mjpeg",
@ -665,7 +665,7 @@ AVOutputFormat mjpeg_oformat = {
/* pcm formats */
#define PCMINPUTDEF(name, long_name, ext, codec) \
AVInputFormat pcm_ ## name ## _iformat = {\
AVInputFormat pcm_ ## name ## _demuxer = {\
#name,\
long_name,\
0,\
@ -679,7 +679,7 @@ AVInputFormat pcm_ ## name ## _iformat = {\
};
#define PCMOUTPUTDEF(name, long_name, ext, codec) \
AVOutputFormat pcm_ ## name ## _oformat = {\
AVOutputFormat pcm_ ## name ## _muxer = {\
#name,\
long_name,\
NULL,\
@ -762,7 +762,7 @@ static int rawvideo_read_packet(AVFormatContext *s, AVPacket *pkt)
}
}
AVInputFormat rawvideo_iformat = {
AVInputFormat rawvideo_demuxer = {
"rawvideo",
"raw video format",
0,
@ -775,7 +775,7 @@ AVInputFormat rawvideo_iformat = {
};
#ifdef CONFIG_MUXERS
AVOutputFormat rawvideo_oformat = {
AVOutputFormat rawvideo_muxer = {
"rawvideo",
"raw video format",
NULL,
@ -795,7 +795,7 @@ static int null_write_packet(struct AVFormatContext *s, AVPacket *pkt)
return 0;
}
AVOutputFormat null_oformat = {
AVOutputFormat null_muxer = {
"null",
"null video format",
NULL,
@ -824,59 +824,59 @@ AVOutputFormat null_oformat = {
int raw_init(void)
{
av_register_input_format(&shorten_iformat);
av_register_input_format(&flac_iformat);
av_register_output_format(&flac_oformat);
av_register_input_format(&shorten_demuxer);
av_register_input_format(&flac_demuxer);
av_register_output_format(&flac_muxer);
av_register_input_format(&ac3_iformat);
av_register_output_format(&ac3_oformat);
av_register_input_format(&ac3_demuxer);
av_register_output_format(&ac3_muxer);
av_register_input_format(&aac_iformat);
av_register_input_format(&aac_demuxer);
av_register_input_format(&dts_iformat);
av_register_input_format(&dts_demuxer);
av_register_input_format(&h261_iformat);
av_register_output_format(&h261_oformat);
av_register_input_format(&h261_demuxer);
av_register_output_format(&h261_muxer);
av_register_input_format(&h263_iformat);
av_register_output_format(&h263_oformat);
av_register_input_format(&h263_demuxer);
av_register_output_format(&h263_muxer);
av_register_input_format(&m4v_iformat);
av_register_output_format(&m4v_oformat);
av_register_input_format(&m4v_demuxer);
av_register_output_format(&m4v_muxer);
av_register_input_format(&h264_iformat);
av_register_output_format(&h264_oformat);
av_register_input_format(&h264_demuxer);
av_register_output_format(&h264_muxer);
av_register_input_format(&mpegvideo_iformat);
av_register_output_format(&mpeg1video_oformat);
av_register_input_format(&mpegvideo_demuxer);
av_register_output_format(&mpeg1video_muxer);
av_register_output_format(&mpeg2video_oformat);
av_register_output_format(&mpeg2video_muxer);
av_register_input_format(&mjpeg_iformat);
av_register_output_format(&mjpeg_oformat);
av_register_input_format(&mjpeg_demuxer);
av_register_output_format(&mjpeg_muxer);
av_register_input_format(&ingenient_iformat);
av_register_input_format(&ingenient_demuxer);
av_register_input_format(&pcm_s16le_iformat);
av_register_output_format(&pcm_s16le_oformat);
av_register_input_format(&pcm_s16be_iformat);
av_register_output_format(&pcm_s16be_oformat);
av_register_input_format(&pcm_u16le_iformat);
av_register_output_format(&pcm_u16le_oformat);
av_register_input_format(&pcm_u16be_iformat);
av_register_output_format(&pcm_u16be_oformat);
av_register_input_format(&pcm_s8_iformat);
av_register_output_format(&pcm_s8_oformat);
av_register_input_format(&pcm_u8_iformat);
av_register_output_format(&pcm_u8_oformat);
av_register_input_format(&pcm_mulaw_iformat);
av_register_output_format(&pcm_mulaw_oformat);
av_register_input_format(&pcm_alaw_iformat);
av_register_output_format(&pcm_alaw_oformat);
av_register_input_format(&pcm_s16le_demuxer);
av_register_output_format(&pcm_s16le_muxer);
av_register_input_format(&pcm_s16be_demuxer);
av_register_output_format(&pcm_s16be_muxer);
av_register_input_format(&pcm_u16le_demuxer);
av_register_output_format(&pcm_u16le_muxer);
av_register_input_format(&pcm_u16be_demuxer);
av_register_output_format(&pcm_u16be_muxer);
av_register_input_format(&pcm_s8_demuxer);
av_register_output_format(&pcm_s8_muxer);
av_register_input_format(&pcm_u8_demuxer);
av_register_output_format(&pcm_u8_muxer);
av_register_input_format(&pcm_mulaw_demuxer);
av_register_output_format(&pcm_mulaw_muxer);
av_register_input_format(&pcm_alaw_demuxer);
av_register_output_format(&pcm_alaw_muxer);
av_register_input_format(&rawvideo_iformat);
av_register_output_format(&rawvideo_oformat);
av_register_input_format(&rawvideo_demuxer);
av_register_output_format(&rawvideo_muxer);
av_register_output_format(&null_oformat);
av_register_output_format(&null_muxer);
return 0;
}

@ -1122,7 +1122,7 @@ static int64_t rm_read_dts(AVFormatContext *s, int stream_index,
return dts;
}
static AVInputFormat rm_iformat = {
static AVInputFormat rm_demuxer = {
"rm",
"rm format",
sizeof(RMContext),
@ -1135,7 +1135,7 @@ static AVInputFormat rm_iformat = {
};
#ifdef CONFIG_MUXERS
static AVOutputFormat rm_oformat = {
static AVOutputFormat rm_muxer = {
"rm",
"rm format",
"application/vnd.rn-realmedia",
@ -1151,9 +1151,9 @@ static AVOutputFormat rm_oformat = {
int rm_init(void)
{
av_register_input_format(&rm_iformat);
av_register_input_format(&rm_demuxer);
#ifdef CONFIG_MUXERS
av_register_output_format(&rm_oformat);
av_register_output_format(&rm_muxer);
#endif //CONFIG_MUXERS
return 0;
}

@ -860,7 +860,7 @@ static int rtp_write_trailer(AVFormatContext *s1)
return 0;
}
AVOutputFormat rtp_mux = {
AVOutputFormat rtp_muxer = {
"rtp",
"RTP output format",
NULL,
@ -875,6 +875,6 @@ AVOutputFormat rtp_mux = {
int rtp_init(void)
{
av_register_output_format(&rtp_mux);
av_register_output_format(&rtp_muxer);
return 0;
}

@ -33,8 +33,8 @@ int rtp_parse_packet(RTPDemuxContext *s, AVPacket *pkt,
const uint8_t *buf, int len);
void rtp_parse_close(RTPDemuxContext *s);
extern AVOutputFormat rtp_mux;
extern AVInputFormat rtp_demux;
extern AVOutputFormat rtp_muxer;
extern AVInputFormat rtp_demuxer;
int rtp_get_local_port(URLContext *h);
int rtp_set_remote_url(URLContext *h, const char *uri);

@ -1245,7 +1245,7 @@ static int rtsp_read_close(AVFormatContext *s)
return 0;
}
AVInputFormat rtsp_demux = {
AVInputFormat rtsp_demuxer = {
"rtsp",
"RTSP input format",
sizeof(RTSPState),
@ -1346,7 +1346,7 @@ static int sdp_read_close(AVFormatContext *s)
}
static AVInputFormat sdp_demux = {
static AVInputFormat sdp_demuxer = {
"sdp",
"SDP",
sizeof(RTSPState),
@ -1410,7 +1410,7 @@ int redir_open(AVFormatContext **ic_ptr, ByteIOContext *f)
return 0;
}
AVInputFormat redir_demux = {
AVInputFormat redir_demuxer = {
"redir",
"Redirector format",
0,
@ -1422,8 +1422,8 @@ AVInputFormat redir_demux = {
int rtsp_init(void)
{
av_register_input_format(&rtsp_demux);
av_register_input_format(&redir_demux);
av_register_input_format(&sdp_demux);
av_register_input_format(&rtsp_demuxer);
av_register_input_format(&redir_demuxer);
av_register_input_format(&sdp_demuxer);
return 0;
}

@ -88,7 +88,7 @@ extern int rtsp_default_protocols;
extern int rtsp_rtp_port_min;
extern int rtsp_rtp_port_max;
extern FFRTSPCallback *ff_rtsp_callback;
extern AVInputFormat rtsp_demux;
extern AVInputFormat rtsp_demuxer;
int rtsp_pause(AVFormatContext *s);
int rtsp_resume(AVFormatContext *s);

@ -297,7 +297,7 @@ static int film_read_close(AVFormatContext *s)
return 0;
}
static AVInputFormat film_iformat = {
static AVInputFormat film_demuxer = {
"film_cpk",
"Sega FILM/CPK format",
sizeof(FilmDemuxContext),
@ -309,6 +309,6 @@ static AVInputFormat film_iformat = {
int film_init(void)
{
av_register_input_format(&film_iformat);
av_register_input_format(&film_demuxer);
return 0;
}

@ -319,7 +319,7 @@ static int vmd_read_close(AVFormatContext *s)
return 0;
}
static AVInputFormat vmd_iformat = {
static AVInputFormat vmd_demuxer = {
"vmd",
"Sierra VMD format",
sizeof(VmdDemuxContext),
@ -331,6 +331,6 @@ static AVInputFormat vmd_iformat = {
int vmd_init(void)
{
av_register_input_format(&vmd_iformat);
av_register_input_format(&vmd_demuxer);
return 0;
}

@ -332,7 +332,7 @@ static int smacker_read_close(AVFormatContext *s)
return 0;
}
static AVInputFormat smacker_iformat = {
static AVInputFormat smacker_demuxer = {
"smk",
"Smacker Video",
sizeof(SmackerContext),
@ -344,6 +344,6 @@ static AVInputFormat smacker_iformat = {
int smacker_init(void)
{
av_register_input_format(&smacker_iformat);
av_register_input_format(&smacker_demuxer);
return 0;
}

@ -146,7 +146,7 @@ static int sol_read_close(AVFormatContext *s)
return 0;
}
static AVInputFormat sol_iformat = {
static AVInputFormat sol_demuxer = {
"sol",
"Sierra SOL Format",
0,
@ -159,6 +159,6 @@ static AVInputFormat sol_iformat = {
int sol_init(void)
{
av_register_input_format(&sol_iformat);
av_register_input_format(&sol_demuxer);
return 0;
}

@ -899,7 +899,7 @@ static int swf_read_close(AVFormatContext *s)
return 0;
}
static AVInputFormat swf_iformat = {
static AVInputFormat swf_demuxer = {
"swf",
"Flash format",
sizeof(SWFContext),
@ -910,7 +910,7 @@ static AVInputFormat swf_iformat = {
};
#ifdef CONFIG_MUXERS
static AVOutputFormat swf_oformat = {
static AVOutputFormat swf_muxer = {
"swf",
"Flash format",
"application/x-shockwave-flash",
@ -926,9 +926,9 @@ static AVOutputFormat swf_oformat = {
int swf_init(void)
{
av_register_input_format(&swf_iformat);
av_register_input_format(&swf_demuxer);
#ifdef CONFIG_MUXERS
av_register_output_format(&swf_oformat);
av_register_output_format(&swf_muxer);
#endif //CONFIG_MUXERS
return 0;
}

@ -139,7 +139,7 @@ static int tta_read_close(AVFormatContext *s)
return 0;
}
AVInputFormat tta_iformat = {
AVInputFormat tta_demuxer = {
"tta",
"true-audio",
sizeof(TTAContext),
@ -152,6 +152,6 @@ AVInputFormat tta_iformat = {
int tta_init(void)
{
av_register_input_format(&tta_iformat);
av_register_input_format(&tta_demuxer);
return 0;
}

@ -599,7 +599,7 @@ int av_open_input_file(AVFormatContext **ic_ptr, const char *filename,
/* XXX: suppress this hack for redirectors */
#ifdef CONFIG_NETWORK
if (fmt == &redir_demux) {
if (fmt == &redir_demuxer) {
err = redir_open(ic_ptr, pb);
url_fclose(pb);
return err;
@ -1730,7 +1730,7 @@ static void av_estimate_timings(AVFormatContext *ic)
}
ic->file_size = file_size;
if ((ic->iformat == &mpegps_demux || ic->iformat == &mpegts_demux) && file_size && !ic->pb.is_streamed) {
if ((ic->iformat == &mpegps_demuxer || ic->iformat == &mpegts_demuxer) && file_size && !ic->pb.is_streamed) {
/* get accurate estimate from the PTSes */
av_estimate_timings_from_pts(ic);
} else if (av_has_timings(ic)) {

@ -522,7 +522,7 @@ static int v4l2_read_close(AVFormatContext *s1)
return 0;
}
static AVInputFormat v4l2_format = {
static AVInputFormat v4l2_demuxer = {
"video4linux2",
"video grab",
sizeof(struct video_data),
@ -535,6 +535,6 @@ static AVInputFormat v4l2_format = {
int v4l2_init(void)
{
av_register_input_format(&v4l2_format);
av_register_input_format(&v4l2_demuxer);
return 0;
}

@ -173,7 +173,7 @@ static int voc_read_close(AVFormatContext *s)
return 0;
}
static AVInputFormat voc_iformat = {
static AVInputFormat voc_demuxer = {
"voc",
"Creative Voice File format",
sizeof(voc_dec_context_t),
@ -256,7 +256,7 @@ static int voc_write_trailer(AVFormatContext *s)
return 0;
}
static AVOutputFormat voc_oformat = {
static AVOutputFormat voc_muxer = {
"voc",
"Creative Voice File format",
"audio/x-voc",
@ -275,10 +275,10 @@ static AVOutputFormat voc_oformat = {
int voc_init(void)
{
#ifdef CONFIG_DEMUXERS
av_register_input_format(&voc_iformat);
av_register_input_format(&voc_demuxer);
#endif /* CONFIG_DEMUXERS */
#ifdef CONFIG_MUXERS
av_register_output_format(&voc_oformat);
av_register_output_format(&voc_muxer);
#endif /* CONFIG_MUXERS */
return 0;
}

@ -405,7 +405,7 @@ static int wav_read_seek(AVFormatContext *s,
}
static AVInputFormat wav_iformat = {
static AVInputFormat wav_demuxer = {
"wav",
"wav format",
sizeof(WAVContext),
@ -417,7 +417,7 @@ static AVInputFormat wav_iformat = {
};
#ifdef CONFIG_MUXERS
static AVOutputFormat wav_oformat = {
static AVOutputFormat wav_muxer = {
"wav",
"wav format",
"audio/x-wav",
@ -433,9 +433,9 @@ static AVOutputFormat wav_oformat = {
int ff_wav_init(void)
{
av_register_input_format(&wav_iformat);
av_register_input_format(&wav_demuxer);
#ifdef CONFIG_MUXERS
av_register_output_format(&wav_oformat);
av_register_output_format(&wav_muxer);
#endif //CONFIG_MUXERS
return 0;
}

@ -381,7 +381,7 @@ static int wc3_read_close(AVFormatContext *s)
return 0;
}
static AVInputFormat wc3_iformat = {
static AVInputFormat wc3_demuxer = {
"wc3movie",
"Wing Commander III movie format",
sizeof(Wc3DemuxContext),
@ -393,6 +393,6 @@ static AVInputFormat wc3_iformat = {
int wc3_init(void)
{
av_register_input_format(&wc3_iformat);
av_register_input_format(&wc3_demuxer);
return 0;
}

@ -357,7 +357,7 @@ static int wsvqa_read_close(AVFormatContext *s)
return 0;
}
static AVInputFormat wsaud_iformat = {
static AVInputFormat wsaud_demuxer = {
"wsaud",
"Westwood Studios audio format",
sizeof(WsAudDemuxContext),
@ -367,7 +367,7 @@ static AVInputFormat wsaud_iformat = {
wsaud_read_close,
};
static AVInputFormat wsvqa_iformat = {
static AVInputFormat wsvqa_demuxer = {
"wsvqa",
"Westwood Studios VQA format",
sizeof(WsVqaDemuxContext),
@ -379,7 +379,7 @@ static AVInputFormat wsvqa_iformat = {
int westwood_init(void)
{
av_register_input_format(&wsaud_iformat);
av_register_input_format(&wsvqa_iformat);
av_register_input_format(&wsaud_demuxer);
av_register_input_format(&wsvqa_demuxer);
return 0;
}

@ -171,7 +171,7 @@ static int yuv4_write_trailer(AVFormatContext *s)
return 0;
}
AVOutputFormat yuv4mpegpipe_oformat = {
AVOutputFormat yuv4mpegpipe_muxer = {
"yuv4mpegpipe",
"YUV4MPEG pipe format",
"",
@ -393,7 +393,7 @@ static int yuv4_probe(AVProbeData *pd)
return 0;
}
AVInputFormat yuv4mpegpipe_iformat = {
AVInputFormat yuv4mpegpipe_demuxer = {
"yuv4mpegpipe",
"YUV4MPEG pipe format",
sizeof(struct frame_attributes),
@ -406,9 +406,9 @@ AVInputFormat yuv4mpegpipe_iformat = {
int yuv4mpeg_init(void)
{
av_register_input_format(&yuv4mpegpipe_iformat);
av_register_input_format(&yuv4mpegpipe_demuxer);
#ifdef CONFIG_MUXERS
av_register_output_format(&yuv4mpegpipe_oformat);
av_register_output_format(&yuv4mpegpipe_muxer);
#endif //CONFIG_MUXERS
return 0;
}

Loading…
Cancel
Save