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

Improve descriptiveness of a number of codec and container long names

tags/n1.0
Diego Biurrun 13 years ago
parent
6774247a9d
commit
0177b7d23a
56 changed files with 75 additions and 75 deletions
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. +1
    -1
      libavcodec/aacdec.c
  2. +1
    -1
      libavcodec/aacenc.c
  3. +1
    -1
      libavcodec/amrnbdec.c
  4. +1
    -1
      libavcodec/amrwbdec.c
  5. +1
    -1
      libavcodec/assdec.c
  6. +1
    -1
      libavcodec/assenc.c
  7. +1
    -1
      libavcodec/bmp.c
  8. +1
    -1
      libavcodec/bmpenc.c
  9. +1
    -1
      libavcodec/cavsdec.c
  10. +1
    -1
      libavcodec/cook.c
  11. +1
    -1
      libavcodec/flvdec.c
  12. +1
    -1
      libavcodec/flvenc.c
  13. +1
    -1
      libavcodec/libfaac.c
  14. +2
    -2
      libavcodec/libilbc.c
  15. +3
    -3
      libavcodec/libopencore-amr.c
  16. +1
    -1
      libavcodec/libopenjpegdec.c
  17. +1
    -1
      libavcodec/libvo-aacenc.c
  18. +2
    -2
      libavcodec/libvo-amrwbenc.c
  19. +1
    -1
      libavcodec/libxavs.c
  20. +1
    -1
      libavcodec/tta.c
  21. +2
    -2
      libavdevice/oss_audio.c
  22. +1
    -1
      libavformat/aacdec.c
  23. +1
    -1
      libavformat/adtsenc.c
  24. +1
    -1
      libavformat/asfdec.c
  25. +2
    -2
      libavformat/asfenc.c
  26. +1
    -1
      libavformat/assdec.c
  27. +1
    -1
      libavformat/assenc.c
  28. +2
    -2
      libavformat/au.c
  29. +1
    -1
      libavformat/avidec.c
  30. +1
    -1
      libavformat/avienc.c
  31. +1
    -1
      libavformat/cafdec.c
  32. +1
    -1
      libavformat/cavsvideodec.c
  33. +1
    -1
      libavformat/dv.c
  34. +1
    -1
      libavformat/dvenc.c
  35. +1
    -1
      libavformat/flvdec.c
  36. +1
    -1
      libavformat/flvenc.c
  37. +1
    -1
      libavformat/gxf.c
  38. +1
    -1
      libavformat/gxfenc.c
  39. +1
    -1
      libavformat/iff.c
  40. +1
    -1
      libavformat/iv8.c
  41. +1
    -1
      libavformat/mov.c
  42. +6
    -6
      libavformat/movenc.c
  43. +1
    -1
      libavformat/mp3dec.c
  44. +2
    -2
      libavformat/mp3enc.c
  45. +1
    -1
      libavformat/mpeg.c
  46. +3
    -3
      libavformat/mpegenc.c
  47. +2
    -2
      libavformat/mpegts.c
  48. +1
    -1
      libavformat/mpegtsenc.c
  49. +1
    -1
      libavformat/mxfdec.c
  50. +2
    -2
      libavformat/mxfenc.c
  51. +1
    -1
      libavformat/rawenc.c
  52. +1
    -1
      libavformat/segment.c
  53. +1
    -1
      libavformat/swfdec.c
  54. +2
    -2
      libavformat/swfenc.c
  55. +1
    -1
      libavformat/tta.c
  56. +2
    -2
      libavformat/wav.c

+ 1
- 1
libavcodec/aacdec.c View File

@@ -2867,7 +2867,7 @@ AVCodec ff_aac_latm_decoder = {
.init = latm_decode_init, .init = latm_decode_init,
.close = aac_decode_close, .close = aac_decode_close,
.decode = latm_decode_frame, .decode = latm_decode_frame,
.long_name = NULL_IF_CONFIG_SMALL("AAC LATM (Advanced Audio Codec LATM syntax)"),
.long_name = NULL_IF_CONFIG_SMALL("AAC LATM (Advanced Audio Coding LATM syntax)"),
.sample_fmts = (const enum AVSampleFormat[]) { .sample_fmts = (const enum AVSampleFormat[]) {
AV_SAMPLE_FMT_FLT, AV_SAMPLE_FMT_S16, AV_SAMPLE_FMT_NONE AV_SAMPLE_FMT_FLT, AV_SAMPLE_FMT_S16, AV_SAMPLE_FMT_NONE
}, },


+ 1
- 1
libavcodec/aacenc.c View File

@@ -828,6 +828,6 @@ AVCodec ff_aac_encoder = {
CODEC_CAP_EXPERIMENTAL, CODEC_CAP_EXPERIMENTAL,
.sample_fmts = (const enum AVSampleFormat[]){ AV_SAMPLE_FMT_FLT, .sample_fmts = (const enum AVSampleFormat[]){ AV_SAMPLE_FMT_FLT,
AV_SAMPLE_FMT_NONE }, AV_SAMPLE_FMT_NONE },
.long_name = NULL_IF_CONFIG_SMALL("Advanced Audio Coding"),
.long_name = NULL_IF_CONFIG_SMALL("AAC (Advanced Audio Coding)"),
.priv_class = &aacenc_class, .priv_class = &aacenc_class,
}; };

+ 1
- 1
libavcodec/amrnbdec.c View File

@@ -1062,7 +1062,7 @@ AVCodec ff_amrnb_decoder = {
.init = amrnb_decode_init, .init = amrnb_decode_init,
.decode = amrnb_decode_frame, .decode = amrnb_decode_frame,
.capabilities = CODEC_CAP_DR1, .capabilities = CODEC_CAP_DR1,
.long_name = NULL_IF_CONFIG_SMALL("Adaptive Multi-Rate NarrowBand"),
.long_name = NULL_IF_CONFIG_SMALL("AMR-NB (Adaptive Multi-Rate NarrowBand)"),
.sample_fmts = (const enum AVSampleFormat[]){ AV_SAMPLE_FMT_FLT, .sample_fmts = (const enum AVSampleFormat[]){ AV_SAMPLE_FMT_FLT,
AV_SAMPLE_FMT_NONE }, AV_SAMPLE_FMT_NONE },
}; };

+ 1
- 1
libavcodec/amrwbdec.c View File

@@ -1242,7 +1242,7 @@ AVCodec ff_amrwb_decoder = {
.init = amrwb_decode_init, .init = amrwb_decode_init,
.decode = amrwb_decode_frame, .decode = amrwb_decode_frame,
.capabilities = CODEC_CAP_DR1, .capabilities = CODEC_CAP_DR1,
.long_name = NULL_IF_CONFIG_SMALL("Adaptive Multi-Rate WideBand"),
.long_name = NULL_IF_CONFIG_SMALL("AMR-WB (Adaptive Multi-Rate WideBand)"),
.sample_fmts = (const enum AVSampleFormat[]){ AV_SAMPLE_FMT_FLT, .sample_fmts = (const enum AVSampleFormat[]){ AV_SAMPLE_FMT_FLT,
AV_SAMPLE_FMT_NONE }, AV_SAMPLE_FMT_NONE },
}; };

+ 1
- 1
libavcodec/assdec.c View File

@@ -54,7 +54,7 @@ static int ass_decode_frame(AVCodecContext *avctx, void *data, int *got_sub_ptr,


AVCodec ff_ass_decoder = { AVCodec ff_ass_decoder = {
.name = "ass", .name = "ass",
.long_name = NULL_IF_CONFIG_SMALL("Advanced SubStation Alpha subtitle"),
.long_name = NULL_IF_CONFIG_SMALL("SSA (SubStation Alpha) subtitle"),
.type = AVMEDIA_TYPE_SUBTITLE, .type = AVMEDIA_TYPE_SUBTITLE,
.id = CODEC_ID_SSA, .id = CODEC_ID_SSA,
.init = ass_decode_init, .init = ass_decode_init,


+ 1
- 1
libavcodec/assenc.c View File

@@ -59,7 +59,7 @@ static int ass_encode_frame(AVCodecContext *avctx,


AVCodec ff_ass_encoder = { AVCodec ff_ass_encoder = {
.name = "ass", .name = "ass",
.long_name = NULL_IF_CONFIG_SMALL("Advanced SubStation Alpha subtitle"),
.long_name = NULL_IF_CONFIG_SMALL("SSA (SubStation Alpha) subtitle"),
.type = AVMEDIA_TYPE_SUBTITLE, .type = AVMEDIA_TYPE_SUBTITLE,
.id = CODEC_ID_SSA, .id = CODEC_ID_SSA,
.init = ass_encode_init, .init = ass_encode_init,


+ 1
- 1
libavcodec/bmp.c View File

@@ -370,5 +370,5 @@ AVCodec ff_bmp_decoder = {
.close = bmp_decode_end, .close = bmp_decode_end,
.decode = bmp_decode_frame, .decode = bmp_decode_frame,
.capabilities = CODEC_CAP_DR1, .capabilities = CODEC_CAP_DR1,
.long_name = NULL_IF_CONFIG_SMALL("BMP image"),
.long_name = NULL_IF_CONFIG_SMALL("BMP (Windows and OS/2 bitmap)"),
}; };

+ 1
- 1
libavcodec/bmpenc.c View File

@@ -173,5 +173,5 @@ AVCodec ff_bmp_encoder = {
PIX_FMT_MONOBLACK, PIX_FMT_MONOBLACK,
PIX_FMT_NONE PIX_FMT_NONE
}, },
.long_name = NULL_IF_CONFIG_SMALL("BMP image"),
.long_name = NULL_IF_CONFIG_SMALL("BMP (Windows and OS/2 bitmap)"),
}; };

+ 1
- 1
libavcodec/cavsdec.c View File

@@ -725,5 +725,5 @@ AVCodec ff_cavs_decoder = {
.decode = cavs_decode_frame, .decode = cavs_decode_frame,
.capabilities = CODEC_CAP_DR1 | CODEC_CAP_DELAY, .capabilities = CODEC_CAP_DR1 | CODEC_CAP_DELAY,
.flush = cavs_flush, .flush = cavs_flush,
.long_name = NULL_IF_CONFIG_SMALL("Chinese AVS video (AVS1-P2, JiZhun profile)"),
.long_name = NULL_IF_CONFIG_SMALL("Chinese AVS (Audio Video Standard) (AVS1-P2, JiZhun profile)"),
}; };

+ 1
- 1
libavcodec/cook.c View File

@@ -1303,5 +1303,5 @@ AVCodec ff_cook_decoder = {
.close = cook_decode_close, .close = cook_decode_close,
.decode = cook_decode_frame, .decode = cook_decode_frame,
.capabilities = CODEC_CAP_DR1, .capabilities = CODEC_CAP_DR1,
.long_name = NULL_IF_CONFIG_SMALL("COOK"),
.long_name = NULL_IF_CONFIG_SMALL("Cook / Cooker / Gecko (RealAudio G2)"),
}; };

+ 1
- 1
libavcodec/flvdec.c View File

@@ -127,6 +127,6 @@ AVCodec ff_flv_decoder = {
.close = ff_h263_decode_end, .close = ff_h263_decode_end,
.decode = ff_h263_decode_frame, .decode = ff_h263_decode_frame,
.capabilities = CODEC_CAP_DRAW_HORIZ_BAND | CODEC_CAP_DR1, .capabilities = CODEC_CAP_DRAW_HORIZ_BAND | CODEC_CAP_DR1,
.long_name = NULL_IF_CONFIG_SMALL("Flash Video (FLV) / Sorenson Spark / Sorenson H.263"),
.long_name = NULL_IF_CONFIG_SMALL("FLV / Sorenson Spark / Sorenson H.263 (Flash Video)"),
.pix_fmts = ff_pixfmt_list_420, .pix_fmts = ff_pixfmt_list_420,
}; };

+ 1
- 1
libavcodec/flvenc.c View File

@@ -95,6 +95,6 @@ AVCodec ff_flv_encoder = {
.encode2 = ff_MPV_encode_picture, .encode2 = ff_MPV_encode_picture,
.close = ff_MPV_encode_end, .close = ff_MPV_encode_end,
.pix_fmts = (const enum PixelFormat[]){ PIX_FMT_YUV420P, PIX_FMT_NONE }, .pix_fmts = (const enum PixelFormat[]){ PIX_FMT_YUV420P, PIX_FMT_NONE },
.long_name = NULL_IF_CONFIG_SMALL("Flash Video (FLV) / Sorenson Spark / Sorenson H.263"),
.long_name = NULL_IF_CONFIG_SMALL("FLV / Sorenson Spark / Sorenson H.263 (Flash Video)"),
.priv_class = &flv_class, .priv_class = &flv_class,
}; };

+ 1
- 1
libavcodec/libfaac.c View File

@@ -246,7 +246,7 @@ AVCodec ff_libfaac_encoder = {
.capabilities = CODEC_CAP_SMALL_LAST_FRAME | CODEC_CAP_DELAY, .capabilities = CODEC_CAP_SMALL_LAST_FRAME | CODEC_CAP_DELAY,
.sample_fmts = (const enum AVSampleFormat[]){ AV_SAMPLE_FMT_S16, .sample_fmts = (const enum AVSampleFormat[]){ AV_SAMPLE_FMT_S16,
AV_SAMPLE_FMT_NONE }, AV_SAMPLE_FMT_NONE },
.long_name = NULL_IF_CONFIG_SMALL("libfaac AAC (Advanced Audio Codec)"),
.long_name = NULL_IF_CONFIG_SMALL("libfaac AAC (Advanced Audio Coding)"),
.profiles = NULL_IF_CONFIG_SMALL(profiles), .profiles = NULL_IF_CONFIG_SMALL(profiles),
.channel_layouts = faac_channel_layouts, .channel_layouts = faac_channel_layouts,
}; };

+ 2
- 2
libavcodec/libilbc.c View File

@@ -111,7 +111,7 @@ AVCodec ff_libilbc_decoder = {
.init = ilbc_decode_init, .init = ilbc_decode_init,
.decode = ilbc_decode_frame, .decode = ilbc_decode_frame,
.capabilities = CODEC_CAP_DR1, .capabilities = CODEC_CAP_DR1,
.long_name = NULL_IF_CONFIG_SMALL("Internet Low Bitrate Codec (iLBC)"),
.long_name = NULL_IF_CONFIG_SMALL("iLBC (Internet Low Bitrate Codec)"),
.priv_class = &ilbc_dec_class, .priv_class = &ilbc_dec_class,
}; };


@@ -203,7 +203,7 @@ AVCodec ff_libilbc_encoder = {
.close = ilbc_encode_close, .close = ilbc_encode_close,
.sample_fmts = (const enum AVSampleFormat[]){ AV_SAMPLE_FMT_S16, .sample_fmts = (const enum AVSampleFormat[]){ AV_SAMPLE_FMT_S16,
AV_SAMPLE_FMT_NONE }, AV_SAMPLE_FMT_NONE },
.long_name = NULL_IF_CONFIG_SMALL("Internet Low Bitrate Codec (iLBC)"),
.long_name = NULL_IF_CONFIG_SMALL("iLBC (Internet Low Bitrate Codec)"),
.defaults = ilbc_encode_defaults, .defaults = ilbc_encode_defaults,
.priv_class = &ilbc_enc_class, .priv_class = &ilbc_enc_class,
}; };

+ 3
- 3
libavcodec/libopencore-amr.c View File

@@ -180,7 +180,7 @@ AVCodec ff_libopencore_amrnb_decoder = {
.close = amr_nb_decode_close, .close = amr_nb_decode_close,
.decode = amr_nb_decode_frame, .decode = amr_nb_decode_frame,
.capabilities = CODEC_CAP_DR1, .capabilities = CODEC_CAP_DR1,
.long_name = NULL_IF_CONFIG_SMALL("OpenCORE Adaptive Multi-Rate (AMR) Narrow-Band"),
.long_name = NULL_IF_CONFIG_SMALL("OpenCORE AMR-NB (Adaptive Multi-Rate Narrow-Band)"),
}; };


static av_cold int amr_nb_encode_init(AVCodecContext *avctx) static av_cold int amr_nb_encode_init(AVCodecContext *avctx)
@@ -299,7 +299,7 @@ AVCodec ff_libopencore_amrnb_encoder = {
.capabilities = CODEC_CAP_DELAY | CODEC_CAP_SMALL_LAST_FRAME, .capabilities = CODEC_CAP_DELAY | CODEC_CAP_SMALL_LAST_FRAME,
.sample_fmts = (const enum AVSampleFormat[]){ AV_SAMPLE_FMT_S16, .sample_fmts = (const enum AVSampleFormat[]){ AV_SAMPLE_FMT_S16,
AV_SAMPLE_FMT_NONE }, AV_SAMPLE_FMT_NONE },
.long_name = NULL_IF_CONFIG_SMALL("OpenCORE Adaptive Multi-Rate (AMR) Narrow-Band"),
.long_name = NULL_IF_CONFIG_SMALL("OpenCORE AMR-NB (Adaptive Multi-Rate Narrow-Band)"),
.priv_class = &class, .priv_class = &class,
}; };


@@ -386,7 +386,7 @@ AVCodec ff_libopencore_amrwb_decoder = {
.close = amr_wb_decode_close, .close = amr_wb_decode_close,
.decode = amr_wb_decode_frame, .decode = amr_wb_decode_frame,
.capabilities = CODEC_CAP_DR1, .capabilities = CODEC_CAP_DR1,
.long_name = NULL_IF_CONFIG_SMALL("OpenCORE Adaptive Multi-Rate (AMR) Wide-Band"),
.long_name = NULL_IF_CONFIG_SMALL("OpenCORE AMR-WB (Adaptive Multi-Rate Wide-Band)"),
}; };


#endif /* CONFIG_LIBOPENCORE_AMRWB */ #endif /* CONFIG_LIBOPENCORE_AMRWB */

+ 1
- 1
libavcodec/libopenjpegdec.c View File

@@ -452,7 +452,7 @@ AVCodec ff_libopenjpeg_decoder = {
.close = libopenjpeg_decode_close, .close = libopenjpeg_decode_close,
.decode = libopenjpeg_decode_frame, .decode = libopenjpeg_decode_frame,
.capabilities = CODEC_CAP_DR1 | CODEC_CAP_FRAME_THREADS, .capabilities = CODEC_CAP_DR1 | CODEC_CAP_FRAME_THREADS,
.long_name = NULL_IF_CONFIG_SMALL("OpenJPEG based JPEG 2000 decoder"),
.long_name = NULL_IF_CONFIG_SMALL("OpenJPEG JPEG 2000"),
.priv_class = &class, .priv_class = &class,
.init_thread_copy = ONLY_IF_THREADS_ENABLED(libopenjpeg_decode_init_thread_copy), .init_thread_copy = ONLY_IF_THREADS_ENABLED(libopenjpeg_decode_init_thread_copy),
}; };

+ 1
- 1
libavcodec/libvo-aacenc.c View File

@@ -198,5 +198,5 @@ AVCodec ff_libvo_aacenc_encoder = {
.capabilities = CODEC_CAP_SMALL_LAST_FRAME | CODEC_CAP_DELAY, .capabilities = CODEC_CAP_SMALL_LAST_FRAME | CODEC_CAP_DELAY,
.sample_fmts = (const enum AVSampleFormat[]){ AV_SAMPLE_FMT_S16, .sample_fmts = (const enum AVSampleFormat[]){ AV_SAMPLE_FMT_S16,
AV_SAMPLE_FMT_NONE }, AV_SAMPLE_FMT_NONE },
.long_name = NULL_IF_CONFIG_SMALL("Android VisualOn AAC"),
.long_name = NULL_IF_CONFIG_SMALL("Android VisualOn AAC (Advanced Audio Coding)"),
}; };

+ 2
- 2
libavcodec/libvo-amrwbenc.c View File

@@ -150,7 +150,7 @@ AVCodec ff_libvo_amrwbenc_encoder = {
.close = amr_wb_encode_close, .close = amr_wb_encode_close,
.sample_fmts = (const enum AVSampleFormat[]){ AV_SAMPLE_FMT_S16, .sample_fmts = (const enum AVSampleFormat[]){ AV_SAMPLE_FMT_S16,
AV_SAMPLE_FMT_NONE }, AV_SAMPLE_FMT_NONE },
.long_name = NULL_IF_CONFIG_SMALL("Android VisualOn Adaptive "
"Multi-Rate (AMR) Wide-Band"),
.long_name = NULL_IF_CONFIG_SMALL("Android VisualOn AMR-WB "
"(Adaptive Multi-Rate Wide-Band)"),
.priv_class = &class, .priv_class = &class,
}; };

+ 1
- 1
libavcodec/libxavs.c View File

@@ -426,7 +426,7 @@ AVCodec ff_libxavs_encoder = {
.close = XAVS_close, .close = XAVS_close,
.capabilities = CODEC_CAP_DELAY | CODEC_CAP_AUTO_THREADS, .capabilities = CODEC_CAP_DELAY | CODEC_CAP_AUTO_THREADS,
.pix_fmts = (const enum PixelFormat[]) { PIX_FMT_YUV420P, PIX_FMT_NONE }, .pix_fmts = (const enum PixelFormat[]) { PIX_FMT_YUV420P, PIX_FMT_NONE },
.long_name = NULL_IF_CONFIG_SMALL("libxavs - the Chinese Audio Video Standard Encoder"),
.long_name = NULL_IF_CONFIG_SMALL("libxavs Chinese AVS (Audio Video Standard)"),
.priv_class = &class, .priv_class = &class,
.defaults = xavs_defaults, .defaults = xavs_defaults,
}; };

+ 1
- 1
libavcodec/tta.c View File

@@ -475,5 +475,5 @@ AVCodec ff_tta_decoder = {
.close = tta_decode_close, .close = tta_decode_close,
.decode = tta_decode_frame, .decode = tta_decode_frame,
.capabilities = CODEC_CAP_DR1, .capabilities = CODEC_CAP_DR1,
.long_name = NULL_IF_CONFIG_SMALL("True Audio (TTA)"),
.long_name = NULL_IF_CONFIG_SMALL("TTA (True Audio)"),
}; };

+ 2
- 2
libavdevice/oss_audio.c View File

@@ -296,7 +296,7 @@ static const AVClass oss_demuxer_class = {


AVInputFormat ff_oss_demuxer = { AVInputFormat ff_oss_demuxer = {
.name = "oss", .name = "oss",
.long_name = NULL_IF_CONFIG_SMALL("Open Sound System capture"),
.long_name = NULL_IF_CONFIG_SMALL("OSS (Open Sound System) capture"),
.priv_data_size = sizeof(AudioData), .priv_data_size = sizeof(AudioData),
.read_header = audio_read_header, .read_header = audio_read_header,
.read_packet = audio_read_packet, .read_packet = audio_read_packet,
@@ -309,7 +309,7 @@ AVInputFormat ff_oss_demuxer = {
#if CONFIG_OSS_OUTDEV #if CONFIG_OSS_OUTDEV
AVOutputFormat ff_oss_muxer = { AVOutputFormat ff_oss_muxer = {
.name = "oss", .name = "oss",
.long_name = NULL_IF_CONFIG_SMALL("Open Sound System playback"),
.long_name = NULL_IF_CONFIG_SMALL("OSS (Open Sound System) playback"),
.priv_data_size = sizeof(AudioData), .priv_data_size = sizeof(AudioData),
/* XXX: we make the assumption that the soundcard accepts this format */ /* XXX: we make the assumption that the soundcard accepts this format */
/* XXX: find better solution with "preinit" method, needed also in /* XXX: find better solution with "preinit" method, needed also in


+ 1
- 1
libavformat/aacdec.c View File

@@ -83,7 +83,7 @@ static int adts_aac_read_header(AVFormatContext *s)


AVInputFormat ff_aac_demuxer = { AVInputFormat ff_aac_demuxer = {
.name = "aac", .name = "aac",
.long_name = NULL_IF_CONFIG_SMALL("raw ADTS AAC"),
.long_name = NULL_IF_CONFIG_SMALL("raw ADTS AAC (Advanced Audio Coding)"),
.read_probe = adts_aac_probe, .read_probe = adts_aac_probe,
.read_header = adts_aac_read_header, .read_header = adts_aac_read_header,
.read_packet = ff_raw_read_partial_packet, .read_packet = ff_raw_read_partial_packet,


+ 1
- 1
libavformat/adtsenc.c View File

@@ -165,7 +165,7 @@ static int adts_write_packet(AVFormatContext *s, AVPacket *pkt)


AVOutputFormat ff_adts_muxer = { AVOutputFormat ff_adts_muxer = {
.name = "adts", .name = "adts",
.long_name = NULL_IF_CONFIG_SMALL("ADTS AAC"),
.long_name = NULL_IF_CONFIG_SMALL("ADTS AAC (Advanced Audio Coding)"),
.mime_type = "audio/aac", .mime_type = "audio/aac",
.extensions = "aac,adts", .extensions = "aac,adts",
.priv_data_size = sizeof(ADTSContext), .priv_data_size = sizeof(ADTSContext),


+ 1
- 1
libavformat/asfdec.c View File

@@ -1401,7 +1401,7 @@ static int asf_read_seek(AVFormatContext *s, int stream_index, int64_t pts, int


AVInputFormat ff_asf_demuxer = { AVInputFormat ff_asf_demuxer = {
.name = "asf", .name = "asf",
.long_name = NULL_IF_CONFIG_SMALL("ASF format"),
.long_name = NULL_IF_CONFIG_SMALL("ASF (Advanced / Active Streaming Format)"),
.priv_data_size = sizeof(ASFContext), .priv_data_size = sizeof(ASFContext),
.read_probe = asf_probe, .read_probe = asf_probe,
.read_header = asf_read_header, .read_header = asf_read_header,


+ 2
- 2
libavformat/asfenc.c View File

@@ -880,7 +880,7 @@ static int asf_write_trailer(AVFormatContext *s)
#if CONFIG_ASF_MUXER #if CONFIG_ASF_MUXER
AVOutputFormat ff_asf_muxer = { AVOutputFormat ff_asf_muxer = {
.name = "asf", .name = "asf",
.long_name = NULL_IF_CONFIG_SMALL("ASF format"),
.long_name = NULL_IF_CONFIG_SMALL("ASF (Advanced / Active Streaming Format)"),
.mime_type = "video/x-ms-asf", .mime_type = "video/x-ms-asf",
.extensions = "asf,wmv,wma", .extensions = "asf,wmv,wma",
.priv_data_size = sizeof(ASFContext), .priv_data_size = sizeof(ASFContext),
@@ -899,7 +899,7 @@ AVOutputFormat ff_asf_muxer = {
#if CONFIG_ASF_STREAM_MUXER #if CONFIG_ASF_STREAM_MUXER
AVOutputFormat ff_asf_stream_muxer = { AVOutputFormat ff_asf_stream_muxer = {
.name = "asf_stream", .name = "asf_stream",
.long_name = NULL_IF_CONFIG_SMALL("ASF format"),
.long_name = NULL_IF_CONFIG_SMALL("ASF (Advanced / Active Streaming Format)"),
.mime_type = "video/x-ms-asf", .mime_type = "video/x-ms-asf",
.extensions = "asf,wmv,wma", .extensions = "asf,wmv,wma",
.priv_data_size = sizeof(ASFContext), .priv_data_size = sizeof(ASFContext),


+ 1
- 1
libavformat/assdec.c View File

@@ -205,7 +205,7 @@ static int read_seek2(AVFormatContext *s, int stream_index,


AVInputFormat ff_ass_demuxer = { AVInputFormat ff_ass_demuxer = {
.name = "ass", .name = "ass",
.long_name = NULL_IF_CONFIG_SMALL("Advanced SubStation Alpha subtitle"),
.long_name = NULL_IF_CONFIG_SMALL("SSA (SubStation Alpha) subtitle"),
.priv_data_size = sizeof(ASSContext), .priv_data_size = sizeof(ASSContext),
.read_probe = probe, .read_probe = probe,
.read_header = read_header, .read_header = read_header,


+ 1
- 1
libavformat/assenc.c View File

@@ -79,7 +79,7 @@ static int write_trailer(AVFormatContext *s)


AVOutputFormat ff_ass_muxer = { AVOutputFormat ff_ass_muxer = {
.name = "ass", .name = "ass",
.long_name = NULL_IF_CONFIG_SMALL("Advanced SubStation Alpha subtitle"),
.long_name = NULL_IF_CONFIG_SMALL("SSA (SubStation Alpha) subtitle"),
.mime_type = "text/x-ssa", .mime_type = "text/x-ssa",
.extensions = "ass,ssa", .extensions = "ass,ssa",
.priv_data_size = sizeof(ASSContext), .priv_data_size = sizeof(ASSContext),


+ 2
- 2
libavformat/au.c View File

@@ -191,7 +191,7 @@ static int au_read_packet(AVFormatContext *s,
#if CONFIG_AU_DEMUXER #if CONFIG_AU_DEMUXER
AVInputFormat ff_au_demuxer = { AVInputFormat ff_au_demuxer = {
.name = "au", .name = "au",
.long_name = NULL_IF_CONFIG_SMALL("SUN AU format"),
.long_name = NULL_IF_CONFIG_SMALL("Sun AU"),
.read_probe = au_probe, .read_probe = au_probe,
.read_header = au_read_header, .read_header = au_read_header,
.read_packet = au_read_packet, .read_packet = au_read_packet,
@@ -203,7 +203,7 @@ AVInputFormat ff_au_demuxer = {
#if CONFIG_AU_MUXER #if CONFIG_AU_MUXER
AVOutputFormat ff_au_muxer = { AVOutputFormat ff_au_muxer = {
.name = "au", .name = "au",
.long_name = NULL_IF_CONFIG_SMALL("SUN AU format"),
.long_name = NULL_IF_CONFIG_SMALL("Sun AU"),
.mime_type = "audio/basic", .mime_type = "audio/basic",
.extensions = "au", .extensions = "au",
.audio_codec = CODEC_ID_PCM_S16BE, .audio_codec = CODEC_ID_PCM_S16BE,


+ 1
- 1
libavformat/avidec.c View File

@@ -1393,7 +1393,7 @@ static int avi_probe(AVProbeData *p)


AVInputFormat ff_avi_demuxer = { AVInputFormat ff_avi_demuxer = {
.name = "avi", .name = "avi",
.long_name = NULL_IF_CONFIG_SMALL("AVI format"),
.long_name = NULL_IF_CONFIG_SMALL("AVI (Audio Video Interleaved)"),
.priv_data_size = sizeof(AVIContext), .priv_data_size = sizeof(AVIContext),
.read_probe = avi_probe, .read_probe = avi_probe,
.read_header = avi_read_header, .read_header = avi_read_header,


+ 1
- 1
libavformat/avienc.c View File

@@ -641,7 +641,7 @@ static int avi_write_trailer(AVFormatContext *s)


AVOutputFormat ff_avi_muxer = { AVOutputFormat ff_avi_muxer = {
.name = "avi", .name = "avi",
.long_name = NULL_IF_CONFIG_SMALL("AVI format"),
.long_name = NULL_IF_CONFIG_SMALL("AVI (Audio Video Interleaved)"),
.mime_type = "video/x-msvideo", .mime_type = "video/x-msvideo",
.extensions = "avi", .extensions = "avi",
.priv_data_size = sizeof(AVIContext), .priv_data_size = sizeof(AVIContext),


+ 1
- 1
libavformat/cafdec.c View File

@@ -417,7 +417,7 @@ static int read_seek(AVFormatContext *s, int stream_index,


AVInputFormat ff_caf_demuxer = { AVInputFormat ff_caf_demuxer = {
.name = "caf", .name = "caf",
.long_name = NULL_IF_CONFIG_SMALL("Apple Core Audio Format"),
.long_name = NULL_IF_CONFIG_SMALL("Apple CAF (Core Audio Format)"),
.priv_data_size = sizeof(CaffContext), .priv_data_size = sizeof(CaffContext),
.read_probe = probe, .read_probe = probe,
.read_header = read_header, .read_header = read_header,


+ 1
- 1
libavformat/cavsvideodec.c View File

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


FF_DEF_RAWVIDEO_DEMUXER(cavsvideo, "raw Chinese AVS video", cavsvideo_probe, NULL, CODEC_ID_CAVS)
FF_DEF_RAWVIDEO_DEMUXER(cavsvideo, "raw Chinese AVS (Audio Video Standard)", cavsvideo_probe, NULL, CODEC_ID_CAVS)

+ 1
- 1
libavformat/dv.c View File

@@ -536,7 +536,7 @@ static int dv_probe(AVProbeData *p)
#if CONFIG_DV_DEMUXER #if CONFIG_DV_DEMUXER
AVInputFormat ff_dv_demuxer = { AVInputFormat ff_dv_demuxer = {
.name = "dv", .name = "dv",
.long_name = NULL_IF_CONFIG_SMALL("DV video"),
.long_name = NULL_IF_CONFIG_SMALL("DV (Digital Video)"),
.priv_data_size = sizeof(RawDVContext), .priv_data_size = sizeof(RawDVContext),
.read_probe = dv_probe, .read_probe = dv_probe,
.read_header = dv_read_header, .read_header = dv_read_header,


+ 1
- 1
libavformat/dvenc.c View File

@@ -405,7 +405,7 @@ static int dv_write_trailer(struct AVFormatContext *s)


AVOutputFormat ff_dv_muxer = { AVOutputFormat ff_dv_muxer = {
.name = "dv", .name = "dv",
.long_name = NULL_IF_CONFIG_SMALL("DV video"),
.long_name = NULL_IF_CONFIG_SMALL("DV (Digital Video)"),
.extensions = "dv", .extensions = "dv",
.priv_data_size = sizeof(DVMuxContext), .priv_data_size = sizeof(DVMuxContext),
.audio_codec = CODEC_ID_PCM_S16LE, .audio_codec = CODEC_ID_PCM_S16LE,


+ 1
- 1
libavformat/flvdec.c View File

@@ -875,7 +875,7 @@ static const AVClass class = {


AVInputFormat ff_flv_demuxer = { AVInputFormat ff_flv_demuxer = {
.name = "flv", .name = "flv",
.long_name = NULL_IF_CONFIG_SMALL("FLV format"),
.long_name = NULL_IF_CONFIG_SMALL("FLV (Flash Video)"),
.priv_data_size = sizeof(FLVContext), .priv_data_size = sizeof(FLVContext),
.read_probe = flv_probe, .read_probe = flv_probe,
.read_header = flv_read_header, .read_header = flv_read_header,


+ 1
- 1
libavformat/flvenc.c View File

@@ -542,7 +542,7 @@ static int flv_write_packet(AVFormatContext *s, AVPacket *pkt)


AVOutputFormat ff_flv_muxer = { AVOutputFormat ff_flv_muxer = {
.name = "flv", .name = "flv",
.long_name = NULL_IF_CONFIG_SMALL("FLV format"),
.long_name = NULL_IF_CONFIG_SMALL("FLV (Flash Video)"),
.mime_type = "video/x-flv", .mime_type = "video/x-flv",
.extensions = "flv", .extensions = "flv",
.priv_data_size = sizeof(FLVContext), .priv_data_size = sizeof(FLVContext),


+ 1
- 1
libavformat/gxf.c View File

@@ -525,7 +525,7 @@ static int64_t gxf_read_timestamp(AVFormatContext *s, int stream_index,


AVInputFormat ff_gxf_demuxer = { AVInputFormat ff_gxf_demuxer = {
.name = "gxf", .name = "gxf",
.long_name = NULL_IF_CONFIG_SMALL("GXF format"),
.long_name = NULL_IF_CONFIG_SMALL("GXF (General eXchange Format)"),
.priv_data_size = sizeof(struct gxf_stream_info), .priv_data_size = sizeof(struct gxf_stream_info),
.read_probe = gxf_probe, .read_probe = gxf_probe,
.read_header = gxf_header, .read_header = gxf_header,


+ 1
- 1
libavformat/gxfenc.c View File

@@ -930,7 +930,7 @@ static int gxf_interleave_packet(AVFormatContext *s, AVPacket *out, AVPacket *pk


AVOutputFormat ff_gxf_muxer = { AVOutputFormat ff_gxf_muxer = {
.name = "gxf", .name = "gxf",
.long_name = NULL_IF_CONFIG_SMALL("GXF format"),
.long_name = NULL_IF_CONFIG_SMALL("GXF (General eXchange Format)"),
.extensions = "gxf", .extensions = "gxf",
.priv_data_size = sizeof(GXFContext), .priv_data_size = sizeof(GXFContext),
.audio_codec = CODEC_ID_PCM_S16LE, .audio_codec = CODEC_ID_PCM_S16LE,


+ 1
- 1
libavformat/iff.c View File

@@ -282,7 +282,7 @@ static int iff_read_packet(AVFormatContext *s,


AVInputFormat ff_iff_demuxer = { AVInputFormat ff_iff_demuxer = {
.name = "iff", .name = "iff",
.long_name = NULL_IF_CONFIG_SMALL("Interchange File Format"),
.long_name = NULL_IF_CONFIG_SMALL("IFF (Interchange File Format)"),
.priv_data_size = sizeof(IffDemuxContext), .priv_data_size = sizeof(IffDemuxContext),
.read_probe = iff_probe, .read_probe = iff_probe,
.read_header = iff_read_header, .read_header = iff_read_header,


+ 1
- 1
libavformat/iv8.c View File

@@ -110,7 +110,7 @@ static int read_packet(AVFormatContext *s, AVPacket *pkt)


AVInputFormat ff_iv8_demuxer = { AVInputFormat ff_iv8_demuxer = {
.name = "iv8", .name = "iv8",
.long_name = NULL_IF_CONFIG_SMALL("A format generated by IndigoVision 8000 video server"),
.long_name = NULL_IF_CONFIG_SMALL("IndigoVision 8000 video"),
.read_probe = probe, .read_probe = probe,
.read_header = read_header, .read_header = read_header,
.read_packet = read_packet, .read_packet = read_packet,


+ 1
- 1
libavformat/mov.c View File

@@ -2892,7 +2892,7 @@ static int mov_read_seek(AVFormatContext *s, int stream_index, int64_t sample_ti


AVInputFormat ff_mov_demuxer = { AVInputFormat ff_mov_demuxer = {
.name = "mov,mp4,m4a,3gp,3g2,mj2", .name = "mov,mp4,m4a,3gp,3g2,mj2",
.long_name = NULL_IF_CONFIG_SMALL("QuickTime/MPEG-4/Motion JPEG 2000 format"),
.long_name = NULL_IF_CONFIG_SMALL("QuickTime / MOV"),
.priv_data_size = sizeof(MOVContext), .priv_data_size = sizeof(MOVContext),
.read_probe = mov_probe, .read_probe = mov_probe,
.read_header = mov_read_header, .read_header = mov_read_header,


+ 6
- 6
libavformat/movenc.c View File

@@ -3248,7 +3248,7 @@ static int mov_write_trailer(AVFormatContext *s)
MOV_CLASS(mov) MOV_CLASS(mov)
AVOutputFormat ff_mov_muxer = { AVOutputFormat ff_mov_muxer = {
.name = "mov", .name = "mov",
.long_name = NULL_IF_CONFIG_SMALL("MOV format"),
.long_name = NULL_IF_CONFIG_SMALL("QuickTime / MOV"),
.extensions = "mov", .extensions = "mov",
.priv_data_size = sizeof(MOVMuxContext), .priv_data_size = sizeof(MOVMuxContext),
.audio_codec = CODEC_ID_AAC, .audio_codec = CODEC_ID_AAC,
@@ -3268,7 +3268,7 @@ AVOutputFormat ff_mov_muxer = {
MOV_CLASS(tgp) MOV_CLASS(tgp)
AVOutputFormat ff_tgp_muxer = { AVOutputFormat ff_tgp_muxer = {
.name = "3gp", .name = "3gp",
.long_name = NULL_IF_CONFIG_SMALL("3GP format"),
.long_name = NULL_IF_CONFIG_SMALL("3GP (3GPP file format)"),
.extensions = "3gp", .extensions = "3gp",
.priv_data_size = sizeof(MOVMuxContext), .priv_data_size = sizeof(MOVMuxContext),
.audio_codec = CODEC_ID_AMR_NB, .audio_codec = CODEC_ID_AMR_NB,
@@ -3285,7 +3285,7 @@ AVOutputFormat ff_tgp_muxer = {
MOV_CLASS(mp4) MOV_CLASS(mp4)
AVOutputFormat ff_mp4_muxer = { AVOutputFormat ff_mp4_muxer = {
.name = "mp4", .name = "mp4",
.long_name = NULL_IF_CONFIG_SMALL("MP4 format"),
.long_name = NULL_IF_CONFIG_SMALL("MP4 (MPEG-4 Part 14)"),
.mime_type = "application/mp4", .mime_type = "application/mp4",
.extensions = "mp4", .extensions = "mp4",
.priv_data_size = sizeof(MOVMuxContext), .priv_data_size = sizeof(MOVMuxContext),
@@ -3304,7 +3304,7 @@ AVOutputFormat ff_mp4_muxer = {
MOV_CLASS(psp) MOV_CLASS(psp)
AVOutputFormat ff_psp_muxer = { AVOutputFormat ff_psp_muxer = {
.name = "psp", .name = "psp",
.long_name = NULL_IF_CONFIG_SMALL("PSP MP4 format"),
.long_name = NULL_IF_CONFIG_SMALL("PSP MP4 (MPEG-4 Part 14)"),
.extensions = "mp4,psp", .extensions = "mp4,psp",
.priv_data_size = sizeof(MOVMuxContext), .priv_data_size = sizeof(MOVMuxContext),
.audio_codec = CODEC_ID_AAC, .audio_codec = CODEC_ID_AAC,
@@ -3322,7 +3322,7 @@ AVOutputFormat ff_psp_muxer = {
MOV_CLASS(tg2) MOV_CLASS(tg2)
AVOutputFormat ff_tg2_muxer = { AVOutputFormat ff_tg2_muxer = {
.name = "3g2", .name = "3g2",
.long_name = NULL_IF_CONFIG_SMALL("3GP2 format"),
.long_name = NULL_IF_CONFIG_SMALL("3GP2 (3GPP2 file format)"),
.extensions = "3g2", .extensions = "3g2",
.priv_data_size = sizeof(MOVMuxContext), .priv_data_size = sizeof(MOVMuxContext),
.audio_codec = CODEC_ID_AMR_NB, .audio_codec = CODEC_ID_AMR_NB,
@@ -3339,7 +3339,7 @@ AVOutputFormat ff_tg2_muxer = {
MOV_CLASS(ipod) MOV_CLASS(ipod)
AVOutputFormat ff_ipod_muxer = { AVOutputFormat ff_ipod_muxer = {
.name = "ipod", .name = "ipod",
.long_name = NULL_IF_CONFIG_SMALL("iPod H.264 MP4 format"),
.long_name = NULL_IF_CONFIG_SMALL("iPod H.264 MP4 (MPEG-4 Part 14)"),
.mime_type = "application/mp4", .mime_type = "application/mp4",
.extensions = "m4v,m4a", .extensions = "m4v,m4a",
.priv_data_size = sizeof(MOVMuxContext), .priv_data_size = sizeof(MOVMuxContext),


+ 1
- 1
libavformat/mp3dec.c View File

@@ -205,7 +205,7 @@ static int mp3_read_packet(AVFormatContext *s, AVPacket *pkt)


AVInputFormat ff_mp3_demuxer = { AVInputFormat ff_mp3_demuxer = {
.name = "mp3", .name = "mp3",
.long_name = NULL_IF_CONFIG_SMALL("MPEG audio layer 2/3"),
.long_name = NULL_IF_CONFIG_SMALL("MP2/3 (MPEG audio layer 2/3)"),
.read_probe = mp3_read_probe, .read_probe = mp3_read_probe,
.read_header = mp3_read_header, .read_header = mp3_read_header,
.read_packet = mp3_read_packet, .read_packet = mp3_read_packet,


+ 2
- 2
libavformat/mp3enc.c View File

@@ -190,7 +190,7 @@ static int mp3_write_trailer(struct AVFormatContext *s)
#if CONFIG_MP2_MUXER #if CONFIG_MP2_MUXER
AVOutputFormat ff_mp2_muxer = { AVOutputFormat ff_mp2_muxer = {
.name = "mp2", .name = "mp2",
.long_name = NULL_IF_CONFIG_SMALL("MPEG audio layer 2"),
.long_name = NULL_IF_CONFIG_SMALL("MP2 (MPEG audio layer 2)"),
.mime_type = "audio/x-mpeg", .mime_type = "audio/x-mpeg",
.extensions = "mp2,m2a", .extensions = "mp2,m2a",
.audio_codec = CODEC_ID_MP2, .audio_codec = CODEC_ID_MP2,
@@ -309,7 +309,7 @@ static int mp3_write_header(struct AVFormatContext *s)


AVOutputFormat ff_mp3_muxer = { AVOutputFormat ff_mp3_muxer = {
.name = "mp3", .name = "mp3",
.long_name = NULL_IF_CONFIG_SMALL("MPEG audio layer 3"),
.long_name = NULL_IF_CONFIG_SMALL("MP3 (MPEG audio layer 3)"),
.mime_type = "audio/x-mpeg", .mime_type = "audio/x-mpeg",
.extensions = "mp3", .extensions = "mp3",
.priv_data_size = sizeof(MP3Context), .priv_data_size = sizeof(MP3Context),


+ 1
- 1
libavformat/mpeg.c View File

@@ -567,7 +567,7 @@ static int64_t mpegps_read_dts(AVFormatContext *s, int stream_index,


AVInputFormat ff_mpegps_demuxer = { AVInputFormat ff_mpegps_demuxer = {
.name = "mpeg", .name = "mpeg",
.long_name = NULL_IF_CONFIG_SMALL("MPEG-PS format"),
.long_name = NULL_IF_CONFIG_SMALL("MPEG-PS (MPEG-2 Program Stream)"),
.priv_data_size = sizeof(MpegDemuxContext), .priv_data_size = sizeof(MpegDemuxContext),
.read_probe = mpegps_probe, .read_probe = mpegps_probe,
.read_header = mpegps_read_header, .read_header = mpegps_read_header,


+ 3
- 3
libavformat/mpegenc.c View File

@@ -1144,7 +1144,7 @@ static const AVClass flavor ## _class = {\
MPEGENC_CLASS(mpeg) MPEGENC_CLASS(mpeg)
AVOutputFormat ff_mpeg1system_muxer = { AVOutputFormat ff_mpeg1system_muxer = {
.name = "mpeg", .name = "mpeg",
.long_name = NULL_IF_CONFIG_SMALL("MPEG-1 System format"),
.long_name = NULL_IF_CONFIG_SMALL("MPEG-1 Systems / MPEG program stream"),
.mime_type = "video/mpeg", .mime_type = "video/mpeg",
.extensions = "mpg,mpeg", .extensions = "mpg,mpeg",
.priv_data_size = sizeof(MpegMuxContext), .priv_data_size = sizeof(MpegMuxContext),
@@ -1160,7 +1160,7 @@ AVOutputFormat ff_mpeg1system_muxer = {
MPEGENC_CLASS(vcd) MPEGENC_CLASS(vcd)
AVOutputFormat ff_mpeg1vcd_muxer = { AVOutputFormat ff_mpeg1vcd_muxer = {
.name = "vcd", .name = "vcd",
.long_name = NULL_IF_CONFIG_SMALL("MPEG-1 System format (VCD)"),
.long_name = NULL_IF_CONFIG_SMALL("MPEG-1 Systems / MPEG program stream (VCD)"),
.mime_type = "video/mpeg", .mime_type = "video/mpeg",
.priv_data_size = sizeof(MpegMuxContext), .priv_data_size = sizeof(MpegMuxContext),
.audio_codec = CODEC_ID_MP2, .audio_codec = CODEC_ID_MP2,
@@ -1193,7 +1193,7 @@ AVOutputFormat ff_mpeg2vob_muxer = {
MPEGENC_CLASS(svcd) MPEGENC_CLASS(svcd)
AVOutputFormat ff_mpeg2svcd_muxer = { AVOutputFormat ff_mpeg2svcd_muxer = {
.name = "svcd", .name = "svcd",
.long_name = NULL_IF_CONFIG_SMALL("MPEG-2 PS format (VOB)"),
.long_name = NULL_IF_CONFIG_SMALL("MPEG-2 PS (SVCD)"),
.mime_type = "video/mpeg", .mime_type = "video/mpeg",
.extensions = "vob", .extensions = "vob",
.priv_data_size = sizeof(MpegMuxContext), .priv_data_size = sizeof(MpegMuxContext),


+ 2
- 2
libavformat/mpegts.c View File

@@ -2169,7 +2169,7 @@ void ff_mpegts_parse_close(MpegTSContext *ts)


AVInputFormat ff_mpegts_demuxer = { AVInputFormat ff_mpegts_demuxer = {
.name = "mpegts", .name = "mpegts",
.long_name = NULL_IF_CONFIG_SMALL("MPEG-2 transport stream format"),
.long_name = NULL_IF_CONFIG_SMALL("MPEG-TS (MPEG-2 Transport Stream)"),
.priv_data_size = sizeof(MpegTSContext), .priv_data_size = sizeof(MpegTSContext),
.read_probe = mpegts_probe, .read_probe = mpegts_probe,
.read_header = mpegts_read_header, .read_header = mpegts_read_header,
@@ -2182,7 +2182,7 @@ AVInputFormat ff_mpegts_demuxer = {


AVInputFormat ff_mpegtsraw_demuxer = { AVInputFormat ff_mpegtsraw_demuxer = {
.name = "mpegtsraw", .name = "mpegtsraw",
.long_name = NULL_IF_CONFIG_SMALL("MPEG-2 raw transport stream format"),
.long_name = NULL_IF_CONFIG_SMALL("raw MPEG-TS (MPEG-2 Transport Stream)"),
.priv_data_size = sizeof(MpegTSContext), .priv_data_size = sizeof(MpegTSContext),
.read_header = mpegts_read_header, .read_header = mpegts_read_header,
.read_packet = mpegts_raw_read_packet, .read_packet = mpegts_raw_read_packet,


+ 1
- 1
libavformat/mpegtsenc.c View File

@@ -1162,7 +1162,7 @@ static int mpegts_write_end(AVFormatContext *s)


AVOutputFormat ff_mpegts_muxer = { AVOutputFormat ff_mpegts_muxer = {
.name = "mpegts", .name = "mpegts",
.long_name = NULL_IF_CONFIG_SMALL("MPEG-2 transport stream format"),
.long_name = NULL_IF_CONFIG_SMALL("MPEG-TS (MPEG-2 Transport Stream)"),
.mime_type = "video/x-mpegts", .mime_type = "video/x-mpegts",
.extensions = "ts,m2t", .extensions = "ts,m2t",
.priv_data_size = sizeof(MpegTSWrite), .priv_data_size = sizeof(MpegTSWrite),


+ 1
- 1
libavformat/mxfdec.c View File

@@ -2246,7 +2246,7 @@ static int mxf_read_seek(AVFormatContext *s, int stream_index, int64_t sample_ti


AVInputFormat ff_mxf_demuxer = { AVInputFormat ff_mxf_demuxer = {
.name = "mxf", .name = "mxf",
.long_name = NULL_IF_CONFIG_SMALL("Material eXchange Format"),
.long_name = NULL_IF_CONFIG_SMALL("MXF (Material eXchange Format)"),
.priv_data_size = sizeof(MXFContext), .priv_data_size = sizeof(MXFContext),
.read_probe = mxf_probe, .read_probe = mxf_probe,
.read_header = mxf_read_header, .read_header = mxf_read_header,


+ 2
- 2
libavformat/mxfenc.c View File

@@ -1890,7 +1890,7 @@ static int mxf_interleave(AVFormatContext *s, AVPacket *out, AVPacket *pkt, int


AVOutputFormat ff_mxf_muxer = { AVOutputFormat ff_mxf_muxer = {
.name = "mxf", .name = "mxf",
.long_name = NULL_IF_CONFIG_SMALL("Material eXchange Format"),
.long_name = NULL_IF_CONFIG_SMALL("MXF (Material eXchange Format)"),
.mime_type = "application/mxf", .mime_type = "application/mxf",
.extensions = "mxf", .extensions = "mxf",
.priv_data_size = sizeof(MXFContext), .priv_data_size = sizeof(MXFContext),
@@ -1905,7 +1905,7 @@ AVOutputFormat ff_mxf_muxer = {


AVOutputFormat ff_mxf_d10_muxer = { AVOutputFormat ff_mxf_d10_muxer = {
.name = "mxf_d10", .name = "mxf_d10",
.long_name = NULL_IF_CONFIG_SMALL("Material eXchange Format, D-10 Mapping"),
.long_name = NULL_IF_CONFIG_SMALL("MXF (Material eXchange Format) D-10 Mapping"),
.mime_type = "application/mxf", .mime_type = "application/mxf",
.priv_data_size = sizeof(MXFContext), .priv_data_size = sizeof(MXFContext),
.audio_codec = CODEC_ID_PCM_S16LE, .audio_codec = CODEC_ID_PCM_S16LE,


+ 1
- 1
libavformat/rawenc.c View File

@@ -60,7 +60,7 @@ AVOutputFormat ff_adx_muxer = {
#if CONFIG_CAVSVIDEO_MUXER #if CONFIG_CAVSVIDEO_MUXER
AVOutputFormat ff_cavsvideo_muxer = { AVOutputFormat ff_cavsvideo_muxer = {
.name = "cavsvideo", .name = "cavsvideo",
.long_name = NULL_IF_CONFIG_SMALL("raw Chinese AVS video"),
.long_name = NULL_IF_CONFIG_SMALL("raw Chinese AVS (Audio Video Standard) video"),
.extensions = "cavs", .extensions = "cavs",
.audio_codec = CODEC_ID_NONE, .audio_codec = CODEC_ID_NONE,
.video_codec = CODEC_ID_CAVS, .video_codec = CODEC_ID_CAVS,


+ 1
- 1
libavformat/segment.c View File

@@ -264,7 +264,7 @@ static const AVClass seg_class = {


AVOutputFormat ff_segment_muxer = { AVOutputFormat ff_segment_muxer = {
.name = "segment", .name = "segment",
.long_name = NULL_IF_CONFIG_SMALL("segment muxer"),
.long_name = NULL_IF_CONFIG_SMALL("segment"),
.priv_data_size = sizeof(SegmentContext), .priv_data_size = sizeof(SegmentContext),
.flags = AVFMT_GLOBALHEADER | AVFMT_NOFILE, .flags = AVFMT_GLOBALHEADER | AVFMT_NOFILE,
.write_header = seg_write_header, .write_header = seg_write_header,


+ 1
- 1
libavformat/swfdec.c View File

@@ -211,7 +211,7 @@ static int swf_read_packet(AVFormatContext *s, AVPacket *pkt)


AVInputFormat ff_swf_demuxer = { AVInputFormat ff_swf_demuxer = {
.name = "swf", .name = "swf",
.long_name = NULL_IF_CONFIG_SMALL("Flash format"),
.long_name = NULL_IF_CONFIG_SMALL("SWF (ShockWave Flash)"),
.priv_data_size = sizeof(SWFContext), .priv_data_size = sizeof(SWFContext),
.read_probe = swf_probe, .read_probe = swf_probe,
.read_header = swf_read_header, .read_header = swf_read_header,


+ 2
- 2
libavformat/swfenc.c View File

@@ -504,7 +504,7 @@ static int swf_write_trailer(AVFormatContext *s)
#if CONFIG_SWF_MUXER #if CONFIG_SWF_MUXER
AVOutputFormat ff_swf_muxer = { AVOutputFormat ff_swf_muxer = {
.name = "swf", .name = "swf",
.long_name = NULL_IF_CONFIG_SMALL("Flash format"),
.long_name = NULL_IF_CONFIG_SMALL("SWF (ShockWave Flash)"),
.mime_type = "application/x-shockwave-flash", .mime_type = "application/x-shockwave-flash",
.extensions = "swf", .extensions = "swf",
.priv_data_size = sizeof(SWFContext), .priv_data_size = sizeof(SWFContext),
@@ -519,7 +519,7 @@ AVOutputFormat ff_swf_muxer = {
#if CONFIG_AVM2_MUXER #if CONFIG_AVM2_MUXER
AVOutputFormat ff_avm2_muxer = { AVOutputFormat ff_avm2_muxer = {
.name = "avm2", .name = "avm2",
.long_name = NULL_IF_CONFIG_SMALL("Flash 9 (AVM2) format"),
.long_name = NULL_IF_CONFIG_SMALL("SWF (ShockWave Flash) (AVM2)"),
.mime_type = "application/x-shockwave-flash", .mime_type = "application/x-shockwave-flash",
.priv_data_size = sizeof(SWFContext), .priv_data_size = sizeof(SWFContext),
.audio_codec = CODEC_ID_MP3, .audio_codec = CODEC_ID_MP3,


+ 1
- 1
libavformat/tta.c View File

@@ -160,7 +160,7 @@ static int tta_read_seek(AVFormatContext *s, int stream_index, int64_t timestamp


AVInputFormat ff_tta_demuxer = { AVInputFormat ff_tta_demuxer = {
.name = "tta", .name = "tta",
.long_name = NULL_IF_CONFIG_SMALL("True Audio"),
.long_name = NULL_IF_CONFIG_SMALL("TTA (True Audio)"),
.priv_data_size = sizeof(TTAContext), .priv_data_size = sizeof(TTAContext),
.read_probe = tta_probe, .read_probe = tta_probe,
.read_header = tta_read_header, .read_header = tta_read_header,


+ 2
- 2
libavformat/wav.c View File

@@ -207,7 +207,7 @@ static const AVClass wav_muxer_class = {


AVOutputFormat ff_wav_muxer = { AVOutputFormat ff_wav_muxer = {
.name = "wav", .name = "wav",
.long_name = NULL_IF_CONFIG_SMALL("WAV format"),
.long_name = NULL_IF_CONFIG_SMALL("WAV / WAVE (Waveform Audio)"),
.mime_type = "audio/x-wav", .mime_type = "audio/x-wav",
.extensions = "wav", .extensions = "wav",
.priv_data_size = sizeof(WAVContext), .priv_data_size = sizeof(WAVContext),
@@ -588,7 +588,7 @@ static int wav_read_seek(AVFormatContext *s,


AVInputFormat ff_wav_demuxer = { AVInputFormat ff_wav_demuxer = {
.name = "wav", .name = "wav",
.long_name = NULL_IF_CONFIG_SMALL("WAV format"),
.long_name = NULL_IF_CONFIG_SMALL("WAV / WAVE (Waveform Audio)"),
.priv_data_size = sizeof(WAVContext), .priv_data_size = sizeof(WAVContext),
.read_probe = wav_probe, .read_probe = wav_probe,
.read_header = wav_read_header, .read_header = wav_read_header,


Write Preview
Loading…
Cancel
Save