Chiebot-Mirror
/
FFmpeg
mirror of https://github.com/FFmpeg/FFmpeg.git
8
0
Fork 0
Code Issues Projects Releases Wiki Activity

cosmetics: Align muxer/demuxer declarations

Browse Source 
Also add missing trailing commas, break long codec_tag lines and
add spaces in codec_tag declarations.

Signed-off-by: Martin Storsjö <martin@martin.st>
pull/5/head
Martin Storsjö 13 years ago
parent fdf3a749d3
commit 20234a4bd7
63 changed files with 174 additions and 156 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 14
      libavformat/a64.c
  2. 4
      libavformat/aacdec.c
  3. 4
      libavformat/ac3dec.c
  4. 4
      libavformat/aea.c
  5. 2
      libavformat/aiffdec.c
  6. 2
      libavformat/aiffenc.c
  7. 2
      libavformat/amr.c
  8. 2
      libavformat/ape.c
  9. 2
      libavformat/asfdec.c
  10. 12
      libavformat/asfenc.c
  11. 4
      libavformat/au.c
  12. 6
      libavformat/avienc.c
  13. 2
      libavformat/bmv.c
  14. 2
      libavformat/cafdec.c
  15. 2
      libavformat/cdg.c
  16. 2
      libavformat/daud.c
  17. 2
      libavformat/dfa.c
  18. 4
      libavformat/dtsdec.c
  19. 2
      libavformat/dv.c
  20. 2
      libavformat/filmstripdec.c
  21. 4
      libavformat/flacdec.c
  22. 2
      libavformat/flacenc.c
  23. 8
      libavformat/flvdec.c
  24. 6
      libavformat/flvenc.c
  25. 4
      libavformat/ingenientdec.c
  26. 2
      libavformat/iv8.c
  27. 4
      libavformat/ivfdec.c
  28. 10
      libavformat/ivfenc.c
  29. 4
      libavformat/libnut.c
  30. 10
      libavformat/matroskaenc.c
  31. 40
      libavformat/movenc.c
  32. 4
      libavformat/mp3dec.c
  33. 2
      libavformat/mp3enc.c
  34. 2
      libavformat/mpc.c
  35. 2
      libavformat/mpeg.c
  36. 10
      libavformat/mpegts.c
  37. 2
      libavformat/mpegtsenc.c
  38. 2
      libavformat/mvi.c
  39. 12
      libavformat/mxg.c
  40. 2
      libavformat/ncdec.c
  41. 2
      libavformat/nullenc.c
  42. 7
      libavformat/nutdec.c
  43. 7
      libavformat/nutenc.c
  44. 2
      libavformat/nuv.c
  45. 2
      libavformat/pva.c
  46. 18
      libavformat/rawdec.c
  47. 34
      libavformat/rawenc.c
  48. 6
      libavformat/rawvideodec.c
  49. 2
      libavformat/rmenc.c
  50. 2
      libavformat/rtpenc.c
  51. 2
      libavformat/sapdec.c
  52. 2
      libavformat/sapenc.c
  53. 2
      libavformat/siff.c
  54. 2
      libavformat/spdifdec.c
  55. 4
      libavformat/spdifenc.c
  56. 2
      libavformat/tmv.c
  57. 2
      libavformat/tta.c
  58. 2
      libavformat/vc1test.c
  59. 2
      libavformat/vocdec.c
  60. 2
      libavformat/vocenc.c
  61. 12
      libavformat/wav.c
  62. 4
      libavformat/yop.c
  63. 2
      libavformat/yuv4mpeg.c

14
libavformat/a64.c
Unescape View File

@ -164,12 +164,12 @@ static int a64_write_trailer(struct AVFormatContext *s)
}
AVOutputFormat ff_a64_muxer = {
.name = "a64",
.long_name = NULL_IF_CONFIG_SMALL("a64 - video for Commodore 64"),
.extensions = "a64, A64",
.name = "a64",
.long_name = NULL_IF_CONFIG_SMALL("a64 - video for Commodore 64"),
.extensions = "a64, A64",
.priv_data_size = sizeof (A64Context),
.video_codec = CODEC_ID_A64_MULTI,
.write_header = a64_write_header,
.write_packet = a64_write_packet,
.write_trailer = a64_write_trailer
.video_codec = CODEC_ID_A64_MULTI,
.write_header = a64_write_header,
.write_packet = a64_write_packet,
.write_trailer = a64_write_trailer,
};

4
libavformat/aacdec.c
Unescape View File

@ -87,7 +87,7 @@ AVInputFormat ff_aac_demuxer = {
.read_probe = adts_aac_probe,
.read_header = adts_aac_read_header,
.read_packet = ff_raw_read_partial_packet,
.flags= AVFMT_GENERIC_INDEX,
.extensions = "aac",
.flags = AVFMT_GENERIC_INDEX,
.extensions = "aac",
.raw_codec_id = CODEC_ID_AAC,
};

4
libavformat/ac3dec.c
Unescape View File

@ -94,8 +94,8 @@ AVInputFormat ff_eac3_demuxer = {
.read_probe = eac3_probe,
.read_header = ff_raw_audio_read_header,
.read_packet = ff_raw_read_partial_packet,
.flags= AVFMT_GENERIC_INDEX,
.extensions = "eac3",
.flags = AVFMT_GENERIC_INDEX,
.extensions = "eac3",
.raw_codec_id = CODEC_ID_EAC3,
};
#endif

4
libavformat/aea.c
Unescape View File

@ -100,6 +100,6 @@ AVInputFormat ff_aea_demuxer = {
.read_header = aea_read_header,
.read_packet = aea_read_packet,
.read_seek = ff_pcm_read_seek,
.flags= AVFMT_GENERIC_INDEX,
.extensions = "aea",
.flags = AVFMT_GENERIC_INDEX,
.extensions = "aea",
};

2
libavformat/aiffdec.c
Unescape View File

@ -328,5 +328,5 @@ AVInputFormat ff_aiff_demuxer = {
.read_header = aiff_read_header,
.read_packet = aiff_read_packet,
.read_seek = ff_pcm_read_seek,
.codec_tag= (const AVCodecTag* const []){ff_codec_aiff_tags, 0},
.codec_tag = (const AVCodecTag* const []){ ff_codec_aiff_tags, 0 },
};

2
libavformat/aiffenc.c
Unescape View File

@ -160,5 +160,5 @@ AVOutputFormat ff_aiff_muxer = {
.write_header = aiff_write_header,
.write_packet = aiff_write_packet,
.write_trailer = aiff_write_trailer,
.codec_tag= (const AVCodecTag* const []){ff_codec_aiff_tags, 0},
.codec_tag = (const AVCodecTag* const []){ ff_codec_aiff_tags, 0 },
};

2
libavformat/amr.c
Unescape View File

@ -177,7 +177,7 @@ AVInputFormat ff_amr_demuxer = {
.read_probe = amr_probe,
.read_header = amr_read_header,
.read_packet = amr_read_packet,
.flags = AVFMT_GENERIC_INDEX,
.flags = AVFMT_GENERIC_INDEX,
};
#endif

2
libavformat/ape.c
Unescape View File

@ -438,5 +438,5 @@ AVInputFormat ff_ape_demuxer = {
.read_packet = ape_read_packet,
.read_close = ape_read_close,
.read_seek = ape_read_seek,
.extensions = "ape,apl,mac"
.extensions = "ape,apl,mac",
};

2
libavformat/asfdec.c
Unescape View File

@ -1292,5 +1292,5 @@ AVInputFormat ff_asf_demuxer = {
.read_close = asf_read_close,
.read_seek = asf_read_seek,
.read_timestamp = asf_read_pts,
.flags = AVFMT_NOBINSEARCH | AVFMT_NOGENSEARCH,
.flags = AVFMT_NOBINSEARCH | AVFMT_NOGENSEARCH,
};

12
libavformat/asfenc.c
Unescape View File

@ -893,8 +893,10 @@ AVOutputFormat ff_asf_muxer = {
.write_header = asf_write_header,
.write_packet = asf_write_packet,
.write_trailer = asf_write_trailer,
.flags = AVFMT_GLOBALHEADER,
.codec_tag= (const AVCodecTag* const []){codec_asf_bmp_tags, ff_codec_bmp_tags, ff_codec_wav_tags, 0},
.flags = AVFMT_GLOBALHEADER,
.codec_tag = (const AVCodecTag* const []){
codec_asf_bmp_tags, ff_codec_bmp_tags, ff_codec_wav_tags, 0
},
};
#endif
@ -914,7 +916,9 @@ AVOutputFormat ff_asf_stream_muxer = {
.write_header = asf_write_stream_header,
.write_packet = asf_write_packet,
.write_trailer = asf_write_trailer,
.flags = AVFMT_GLOBALHEADER,
.codec_tag= (const AVCodecTag* const []){codec_asf_bmp_tags, ff_codec_bmp_tags, ff_codec_wav_tags, 0},
.flags = AVFMT_GLOBALHEADER,
.codec_tag = (const AVCodecTag* const []){
codec_asf_bmp_tags, ff_codec_bmp_tags, ff_codec_wav_tags, 0
},
};
#endif //CONFIG_ASF_STREAM_MUXER

4
libavformat/au.c
Unescape View File

@ -191,7 +191,7 @@ AVInputFormat ff_au_demuxer = {
.read_header = au_read_header,
.read_packet = au_read_packet,
.read_seek = ff_pcm_read_seek,
.codec_tag= (const AVCodecTag* const []){codec_au_tags, 0},
.codec_tag = (const AVCodecTag* const []){ codec_au_tags, 0 },
};
#endif
@ -206,6 +206,6 @@ AVOutputFormat ff_au_muxer = {
.write_header = au_write_header,
.write_packet = au_write_packet,
.write_trailer = au_write_trailer,
.codec_tag= (const AVCodecTag* const []){codec_au_tags, 0},
.codec_tag = (const AVCodecTag* const []){ codec_au_tags, 0 },
};
#endif //CONFIG_AU_MUXER

6
libavformat/avienc.c
Unescape View File

@ -654,6 +654,8 @@ AVOutputFormat ff_avi_muxer = {
.write_header = avi_write_header,
.write_packet = avi_write_packet,
.write_trailer = avi_write_trailer,
.codec_tag= (const AVCodecTag* const []){ff_codec_bmp_tags, ff_codec_wav_tags, 0},
.flags= AVFMT_VARIABLE_FPS,
.codec_tag = (const AVCodecTag* const []){
ff_codec_bmp_tags, ff_codec_wav_tags, 0
},
.flags = AVFMT_VARIABLE_FPS,
};

2
libavformat/bmv.c
Unescape View File

@ -133,5 +133,5 @@ AVInputFormat ff_bmv_demuxer = {
.read_header = bmv_read_header,
.read_packet = bmv_read_packet,
.read_close = bmv_read_close,
.extensions = "bmv"
.extensions = "bmv",
};

2
libavformat/cafdec.c
Unescape View File

@ -394,5 +394,5 @@ AVInputFormat ff_caf_demuxer = {
.read_header = read_header,
.read_packet = read_packet,
.read_seek = read_seek,
.codec_tag = (const AVCodecTag*[]){ff_codec_caf_tags, 0},
.codec_tag = (const AVCodecTag*[]){ ff_codec_caf_tags, 0 },
};

2
libavformat/cdg.c
Unescape View File

@ -68,5 +68,5 @@ AVInputFormat ff_cdg_demuxer = {
.long_name = NULL_IF_CONFIG_SMALL("CD Graphics Format"),
.read_header = read_header,
.read_packet = read_packet,
.extensions = "cdg"
.extensions = "cdg",
};

2
libavformat/daud.c
Unescape View File

@ -75,7 +75,7 @@ AVInputFormat ff_daud_demuxer = {
.long_name = NULL_IF_CONFIG_SMALL("D-Cinema audio format"),
.read_header = daud_header,
.read_packet = daud_packet,
.extensions = "302",
.extensions = "302",
};
#endif

2
libavformat/dfa.c
Unescape View File

@ -114,5 +114,5 @@ AVInputFormat ff_dfa_demuxer = {
.read_probe = dfa_probe,
.read_header = dfa_read_header,
.read_packet = dfa_read_packet,
.flags = AVFMT_GENERIC_INDEX,
.flags = AVFMT_GENERIC_INDEX,
};

4
libavformat/dtsdec.c
Unescape View File

@ -71,7 +71,7 @@ AVInputFormat ff_dts_demuxer = {
.read_probe = dts_probe,
.read_header = ff_raw_audio_read_header,
.read_packet = ff_raw_read_partial_packet,
.flags= AVFMT_GENERIC_INDEX,
.extensions = "dts",
.flags = AVFMT_GENERIC_INDEX,
.extensions = "dts",
.raw_codec_id = CODEC_ID_DTS,
};

2
libavformat/dv.c
Unescape View File

@ -542,6 +542,6 @@ AVInputFormat ff_dv_demuxer = {
.read_packet = dv_read_packet,
.read_close = dv_read_close,
.read_seek = dv_read_seek,
.extensions = "dv,dif",
.extensions = "dv,dif",
};
#endif

2
libavformat/filmstripdec.c
Unescape View File

@ -106,5 +106,5 @@ AVInputFormat ff_filmstrip_demuxer = {
.read_header = read_header,
.read_packet = read_packet,
.read_seek = read_seek,
.extensions = "flm",
.extensions = "flm",
};

4
libavformat/flacdec.c
Unescape View File

@ -155,7 +155,7 @@ AVInputFormat ff_flac_demuxer = {
.read_probe = flac_probe,
.read_header = flac_read_header,
.read_packet = ff_raw_read_partial_packet,
.flags= AVFMT_GENERIC_INDEX,
.extensions = "flac",
.flags = AVFMT_GENERIC_INDEX,
.extensions = "flac",
.raw_codec_id = CODEC_ID_FLAC,
};

2
libavformat/flacenc.c
Unescape View File

@ -127,5 +127,5 @@ AVOutputFormat ff_flac_muxer = {
.write_header = flac_write_header,
.write_packet = flac_write_packet,
.write_trailer = flac_write_trailer,
.flags= AVFMT_NOTIMESTAMPS,
.flags = AVFMT_NOTIMESTAMPS,
};

8
libavformat/flvdec.c
Unescape View File

@ -707,10 +707,10 @@ AVInputFormat ff_flv_demuxer = {
.read_probe = flv_probe,
.read_header = flv_read_header,
.read_packet = flv_read_packet,
.read_seek = flv_read_seek,
.read_seek = flv_read_seek,
#if 0
.read_seek2 = flv_read_seek2,
.read_seek2 = flv_read_seek2,
#endif
.read_close = flv_read_close,
.extensions = "flv",
.read_close = flv_read_close,
.extensions = "flv",
};

6
libavformat/flvenc.c
Unescape View File

@ -484,6 +484,8 @@ AVOutputFormat ff_flv_muxer = {
.write_header = flv_write_header,
.write_packet = flv_write_packet,
.write_trailer = flv_write_trailer,
.codec_tag= (const AVCodecTag* const []){flv_video_codec_ids, flv_audio_codec_ids, 0},
.flags= AVFMT_GLOBALHEADER | AVFMT_VARIABLE_FPS,
.codec_tag = (const AVCodecTag* const []){
flv_video_codec_ids, flv_audio_codec_ids, 0
},
.flags = AVFMT_GLOBALHEADER | AVFMT_VARIABLE_FPS,
};

4
libavformat/ingenientdec.c
Unescape View File

@ -66,8 +66,8 @@ AVInputFormat ff_ingenient_demuxer = {
.priv_data_size = sizeof(FFRawVideoDemuxerContext),
.read_header = ff_raw_video_read_header,
.read_packet = ingenient_read_packet,
.flags= AVFMT_GENERIC_INDEX,
.extensions = "cgi", // FIXME
.flags = AVFMT_GENERIC_INDEX,
.extensions = "cgi", // FIXME
.raw_codec_id = CODEC_ID_MJPEG,
.priv_class = &ingenient_demuxer_class,
};

2
libavformat/iv8.c
Unescape View File

@ -114,5 +114,5 @@ AVInputFormat ff_iv8_demuxer = {
.read_probe = probe,
.read_header = read_header,
.read_packet = read_packet,
.flags= AVFMT_GENERIC_INDEX,
.flags = AVFMT_GENERIC_INDEX,
};

4
libavformat/ivfdec.c
Unescape View File

@ -86,6 +86,6 @@ AVInputFormat ff_ivf_demuxer = {
.read_probe = probe,
.read_header = read_header,
.read_packet = read_packet,
.flags= AVFMT_GENERIC_INDEX,
.codec_tag = (const AVCodecTag*[]){ff_codec_bmp_tags, 0},
.flags = AVFMT_GENERIC_INDEX,
.codec_tag = (const AVCodecTag*[]){ ff_codec_bmp_tags, 0 },
};

10
libavformat/ivfenc.c
Unescape View File

@ -59,11 +59,11 @@ static int ivf_write_packet(AVFormatContext *s, AVPacket *pkt)
}
AVOutputFormat ff_ivf_muxer = {
.name = "ivf",
.long_name = NULL_IF_CONFIG_SMALL("On2 IVF"),
.extensions = "ivf",
.audio_codec = CODEC_ID_NONE,
.video_codec = CODEC_ID_VP8,
.name = "ivf",
.long_name = NULL_IF_CONFIG_SMALL("On2 IVF"),
.extensions = "ivf",
.audio_codec = CODEC_ID_NONE,
.video_codec = CODEC_ID_VP8,
.write_header = ivf_write_header,
.write_packet = ivf_write_packet,
};

4
libavformat/libnut.c
Unescape View File

@ -162,7 +162,7 @@ AVOutputFormat ff_libnut_muxer = {
.write_header = nut_write_header,
.write_packet = nut_write_packet,
.write_trailer = nut_write_trailer,
.flags = AVFMT_GLOBALHEADER,
.flags = AVFMT_GLOBALHEADER,
};
#endif /* CONFIG_LIBNUT_MUXER */
@ -307,5 +307,5 @@ AVInputFormat ff_libnut_demuxer = {
.read_packet = nut_read_packet,
.read_close = nut_read_close,
.read_seek = nut_read_seek,
.extensions = "nut",
.extensions = "nut",
};

10
libavformat/matroskaenc.c
Unescape View File

@ -1306,7 +1306,9 @@ AVOutputFormat ff_matroska_muxer = {
.write_packet = mkv_write_packet,
.write_trailer = mkv_write_trailer,
.flags = AVFMT_GLOBALHEADER | AVFMT_VARIABLE_FPS,
.codec_tag = (const AVCodecTag* const []){ff_codec_bmp_tags, ff_codec_wav_tags, 0},
.codec_tag = (const AVCodecTag* const []){
ff_codec_bmp_tags, ff_codec_wav_tags, 0
},
.subtitle_codec = CODEC_ID_SSA,
.query_codec = mkv_query_codec,
};
@ -1324,7 +1326,7 @@ AVOutputFormat ff_webm_muxer = {
.write_header = mkv_write_header,
.write_packet = mkv_write_packet,
.write_trailer = mkv_write_trailer,
.flags = AVFMT_GLOBALHEADER | AVFMT_VARIABLE_FPS,
.flags = AVFMT_GLOBALHEADER | AVFMT_VARIABLE_FPS,
};
#endif
@ -1344,7 +1346,7 @@ AVOutputFormat ff_matroska_audio_muxer = {
.write_header = mkv_write_header,
.write_packet = mkv_write_packet,
.write_trailer = mkv_write_trailer,
.flags = AVFMT_GLOBALHEADER,
.codec_tag = (const AVCodecTag* const []){ff_codec_wav_tags, 0},
.flags = AVFMT_GLOBALHEADER,
.codec_tag = (const AVCodecTag* const []){ ff_codec_wav_tags, 0 },
};
#endif

40
libavformat/movenc.c
Unescape View File

@ -3279,9 +3279,11 @@ AVOutputFormat ff_mov_muxer = {
.write_header = mov_write_header,
.write_packet = ff_mov_write_packet,
.write_trailer = mov_write_trailer,
.flags = AVFMT_GLOBALHEADER | AVFMT_ALLOW_FLUSH,
.codec_tag = (const AVCodecTag* const []){ff_codec_movvideo_tags, ff_codec_movaudio_tags, 0},
.priv_class = &mov_muxer_class,
.flags = AVFMT_GLOBALHEADER | AVFMT_ALLOW_FLUSH,
.codec_tag = (const AVCodecTag* const []){
ff_codec_movvideo_tags, ff_codec_movaudio_tags, 0
},
.priv_class = &mov_muxer_class,
};
#endif
#if CONFIG_TGP_MUXER
@ -3296,9 +3298,9 @@ AVOutputFormat ff_tgp_muxer = {
.write_header = mov_write_header,
.write_packet = ff_mov_write_packet,
.write_trailer = mov_write_trailer,
.flags = AVFMT_GLOBALHEADER | AVFMT_ALLOW_FLUSH,
.codec_tag = (const AVCodecTag* const []){codec_3gp_tags, 0},
.priv_class = &tgp_muxer_class,
.flags = AVFMT_GLOBALHEADER | AVFMT_ALLOW_FLUSH,
.codec_tag = (const AVCodecTag* const []){ codec_3gp_tags, 0 },
.priv_class = &tgp_muxer_class,
};
#endif
#if CONFIG_MP4_MUXER
@ -3318,9 +3320,9 @@ AVOutputFormat ff_mp4_muxer = {
.write_header = mov_write_header,
.write_packet = ff_mov_write_packet,
.write_trailer = mov_write_trailer,
.flags = AVFMT_GLOBALHEADER | AVFMT_ALLOW_FLUSH,
.codec_tag = (const AVCodecTag* const []){ff_mp4_obj_type, 0},
.priv_class = &mp4_muxer_class,
.flags = AVFMT_GLOBALHEADER | AVFMT_ALLOW_FLUSH,
.codec_tag = (const AVCodecTag* const []){ ff_mp4_obj_type, 0 },
.priv_class = &mp4_muxer_class,
};
#endif
#if CONFIG_PSP_MUXER
@ -3339,9 +3341,9 @@ AVOutputFormat ff_psp_muxer = {
.write_header = mov_write_header,
.write_packet = ff_mov_write_packet,
.write_trailer = mov_write_trailer,
.flags = AVFMT_GLOBALHEADER | AVFMT_ALLOW_FLUSH,
.codec_tag = (const AVCodecTag* const []){ff_mp4_obj_type, 0},
.priv_class = &psp_muxer_class,
.flags = AVFMT_GLOBALHEADER | AVFMT_ALLOW_FLUSH,
.codec_tag = (const AVCodecTag* const []){ ff_mp4_obj_type, 0 },
.priv_class = &psp_muxer_class,
};
#endif
#if CONFIG_TG2_MUXER
@ -3356,9 +3358,9 @@ AVOutputFormat ff_tg2_muxer = {
.write_header = mov_write_header,
.write_packet = ff_mov_write_packet,
.write_trailer = mov_write_trailer,
.flags = AVFMT_GLOBALHEADER | AVFMT_ALLOW_FLUSH,
.codec_tag = (const AVCodecTag* const []){codec_3gp_tags, 0},
.priv_class = &tg2_muxer_class,
.flags = AVFMT_GLOBALHEADER | AVFMT_ALLOW_FLUSH,
.codec_tag = (const AVCodecTag* const []){ codec_3gp_tags, 0 },
.priv_class = &tg2_muxer_class,
};
#endif
#if CONFIG_IPOD_MUXER
@ -3374,9 +3376,9 @@ AVOutputFormat ff_ipod_muxer = {
.write_header = mov_write_header,
.write_packet = ff_mov_write_packet,
.write_trailer = mov_write_trailer,
.flags = AVFMT_GLOBALHEADER | AVFMT_ALLOW_FLUSH,
.codec_tag = (const AVCodecTag* const []){codec_ipod_tags, 0},
.priv_class = &ipod_muxer_class,
.flags = AVFMT_GLOBALHEADER | AVFMT_ALLOW_FLUSH,
.codec_tag = (const AVCodecTag* const []){ codec_ipod_tags, 0 },
.priv_class = &ipod_muxer_class,
};
#endif
#if CONFIG_ISMV_MUXER
@ -3393,7 +3395,7 @@ AVOutputFormat ff_ismv_muxer = {
.write_packet = ff_mov_write_packet,
.write_trailer = mov_write_trailer,
.flags = AVFMT_GLOBALHEADER | AVFMT_ALLOW_FLUSH,
.codec_tag = (const AVCodecTag* const []){ff_mp4_obj_type, 0},
.codec_tag = (const AVCodecTag* const []){ ff_mp4_obj_type, 0 },
.priv_class = &ismv_muxer_class,
};
#endif

4
libavformat/mp3dec.c
Unescape View File

@ -193,6 +193,6 @@ AVInputFormat ff_mp3_demuxer = {
.read_probe = mp3_read_probe,
.read_header = mp3_read_header,
.read_packet = mp3_read_packet,
.flags= AVFMT_GENERIC_INDEX,
.extensions = "mp2,mp3,m2a", /* XXX: use probe */
.flags = AVFMT_GENERIC_INDEX,
.extensions = "mp2,mp3,m2a", /* XXX: use probe */
};

2
libavformat/mp3enc.c
Unescape View File

@ -319,6 +319,6 @@ AVOutputFormat ff_mp3_muxer = {
.write_packet = mp3_write_packet,
.write_trailer = mp3_write_trailer,
.flags = AVFMT_NOTIMESTAMPS,
.priv_class = &mp3_muxer_class,
.priv_class = &mp3_muxer_class,
};
#endif

2
libavformat/mpc.c
Unescape View File

@ -231,5 +231,5 @@ AVInputFormat ff_mpc_demuxer = {
.read_packet = mpc_read_packet,
.read_close = mpc_read_close,
.read_seek = mpc_read_seek,
.extensions = "mpc",
.extensions = "mpc",
};

2
libavformat/mpeg.c
Unescape View File

@ -614,5 +614,5 @@ AVInputFormat ff_mpegps_demuxer = {
.read_header = mpegps_read_header,
.read_packet = mpegps_read_packet,
.read_timestamp = mpegps_read_dts,
.flags = AVFMT_SHOW_IDS|AVFMT_TS_DISCONT,
.flags = AVFMT_SHOW_IDS | AVFMT_TS_DISCONT,
};

10
libavformat/mpegts.c
Unescape View File

@ -2266,9 +2266,9 @@ AVInputFormat ff_mpegts_demuxer = {
.read_close = mpegts_read_close,
.read_seek = read_seek,
.read_timestamp = mpegts_get_pcr,
.flags = AVFMT_SHOW_IDS|AVFMT_TS_DISCONT,
.flags = AVFMT_SHOW_IDS | AVFMT_TS_DISCONT,
#ifdef USE_SYNCPOINT_SEARCH
.read_seek2 = read_seek2,
.read_seek2 = read_seek2,
#endif
};
@ -2281,9 +2281,9 @@ AVInputFormat ff_mpegtsraw_demuxer = {
.read_close = mpegts_read_close,
.read_seek = read_seek,
.read_timestamp = mpegts_get_pcr,
.flags = AVFMT_SHOW_IDS|AVFMT_TS_DISCONT,
.flags = AVFMT_SHOW_IDS | AVFMT_TS_DISCONT,
#ifdef USE_SYNCPOINT_SEARCH
.read_seek2 = read_seek2,
.read_seek2 = read_seek2,
#endif
.priv_class = &mpegtsraw_class,
.priv_class = &mpegtsraw_class,
};

2
libavformat/mpegtsenc.c
Unescape View File

@ -1125,5 +1125,5 @@ AVOutputFormat ff_mpegts_muxer = {
.write_packet = mpegts_write_packet,
.write_trailer = mpegts_write_end,
.flags = AVFMT_ALLOW_FLUSH,
.priv_class = &mpegts_muxer_class,
.priv_class = &mpegts_muxer_class,
};

2
libavformat/mvi.c
Unescape View File

@ -130,5 +130,5 @@ AVInputFormat ff_mvi_demuxer = {
.priv_data_size = sizeof(MviDemuxContext),
.read_header = read_header,
.read_packet = read_packet,
.extensions = "mvi"
.extensions = "mvi",
};

12
libavformat/mxg.c
Unescape View File

@ -240,11 +240,11 @@ static int mxg_close(struct AVFormatContext *s)
}
AVInputFormat ff_mxg_demuxer = {
.name = "mxg",
.long_name = NULL_IF_CONFIG_SMALL("MxPEG clip file format"),
.name = "mxg",
.long_name = NULL_IF_CONFIG_SMALL("MxPEG clip file format"),
.priv_data_size = sizeof(MXGContext),
.read_header = mxg_read_header,
.read_packet = mxg_read_packet,
.read_close = mxg_close,
.extensions = "mxg"
.read_header = mxg_read_header,
.read_packet = mxg_read_packet,
.read_close = mxg_close,
.extensions = "mxg",
};

2
libavformat/ncdec.c
Unescape View File

@ -97,5 +97,5 @@ AVInputFormat ff_nc_demuxer = {
.read_probe = nc_probe,
.read_header = nc_read_header,
.read_packet = nc_read_packet,
.extensions = "v",
.extensions = "v",
};

2
libavformat/nullenc.c
Unescape View File

@ -32,5 +32,5 @@ AVOutputFormat ff_null_muxer = {
.audio_codec = AV_NE(CODEC_ID_PCM_S16BE, CODEC_ID_PCM_S16LE),
.video_codec = CODEC_ID_RAWVIDEO,
.write_packet = null_write_packet,
.flags = AVFMT_NOFILE | AVFMT_NOTIMESTAMPS | AVFMT_RAWPICTURE,
.flags = AVFMT_NOFILE | AVFMT_NOTIMESTAMPS | AVFMT_RAWPICTURE,
};

7
libavformat/nutdec.c
Unescape View File

@ -931,7 +931,10 @@ AVInputFormat ff_nut_demuxer = {
.read_packet = nut_read_packet,
.read_close = nut_read_close,
.read_seek = read_seek,
.extensions = "nut",
.codec_tag = (const AVCodecTag * const []) { ff_codec_bmp_tags, ff_nut_video_tags, ff_codec_wav_tags, ff_nut_subtitle_tags, 0 },
.extensions = "nut",
.codec_tag = (const AVCodecTag * const []) {
ff_codec_bmp_tags, ff_nut_video_tags, ff_codec_wav_tags,
ff_nut_subtitle_tags, 0
},
};
#endif

7
libavformat/nutenc.c
Unescape View File

@ -877,6 +877,9 @@ AVOutputFormat ff_nut_muxer = {
.write_header = nut_write_header,
.write_packet = nut_write_packet,
.write_trailer = nut_write_trailer,
.flags = AVFMT_GLOBALHEADER | AVFMT_VARIABLE_FPS,
.codec_tag = (const AVCodecTag * const []){ ff_codec_bmp_tags, ff_nut_video_tags, ff_codec_wav_tags, ff_nut_subtitle_tags, 0 },
.flags = AVFMT_GLOBALHEADER | AVFMT_VARIABLE_FPS,
.codec_tag = (const AVCodecTag * const []){
ff_codec_bmp_tags, ff_nut_video_tags, ff_codec_wav_tags,
ff_nut_subtitle_tags, 0
},
};

2
libavformat/nuv.c
Unescape View File

@ -266,5 +266,5 @@ AVInputFormat ff_nuv_demuxer = {
.read_probe = nuv_probe,
.read_header = nuv_header,
.read_packet = nuv_packet,
.flags = AVFMT_GENERIC_INDEX,
.flags = AVFMT_GENERIC_INDEX,
};

2
libavformat/pva.c
Unescape View File

@ -208,5 +208,5 @@ AVInputFormat ff_pva_demuxer = {
.read_probe = pva_probe,
.read_header = pva_read_header,
.read_packet = pva_read_packet,
.read_timestamp = pva_read_timestamp
.read_timestamp = pva_read_timestamp,
};

18
libavformat/rawdec.c
Unescape View File

@ -180,8 +180,8 @@ AVInputFormat ff_g722_demuxer = {
.long_name = NULL_IF_CONFIG_SMALL("raw G.722"),
.read_header = ff_raw_read_header,
.read_packet = ff_raw_read_partial_packet,
.flags= AVFMT_GENERIC_INDEX,
.extensions = "g722,722",
.flags = AVFMT_GENERIC_INDEX,
.extensions = "g722,722",
.raw_codec_id = CODEC_ID_ADPCM_G722,
};
#endif
@ -192,8 +192,8 @@ AVInputFormat ff_latm_demuxer = {
.long_name = NULL_IF_CONFIG_SMALL("raw LOAS/LATM"),
.read_header = ff_raw_audio_read_header,
.read_packet = ff_raw_read_partial_packet,
.flags= AVFMT_GENERIC_INDEX,
.extensions = "latm",
.flags = AVFMT_GENERIC_INDEX,
.extensions = "latm",
.raw_codec_id = CODEC_ID_AAC_LATM,
};
#endif
@ -208,8 +208,8 @@ AVInputFormat ff_mlp_demuxer = {
.long_name = NULL_IF_CONFIG_SMALL("raw MLP"),
.read_header = ff_raw_audio_read_header,
.read_packet = ff_raw_read_partial_packet,
.flags= AVFMT_GENERIC_INDEX,
.extensions = "mlp",
.flags = AVFMT_GENERIC_INDEX,
.extensions = "mlp",
.raw_codec_id = CODEC_ID_MLP,
};
#endif
@ -220,8 +220,8 @@ AVInputFormat ff_truehd_demuxer = {
.long_name = NULL_IF_CONFIG_SMALL("raw TrueHD"),
.read_header = ff_raw_audio_read_header,
.read_packet = ff_raw_read_partial_packet,
.flags= AVFMT_GENERIC_INDEX,
.extensions = "thd",
.flags = AVFMT_GENERIC_INDEX,
.extensions = "thd",
.raw_codec_id = CODEC_ID_TRUEHD,
};
#endif
@ -233,7 +233,7 @@ AVInputFormat ff_shorten_demuxer = {
.read_header = ff_raw_audio_read_header,
.read_packet = ff_raw_read_partial_packet,
.flags = AVFMT_NOBINSEARCH | AVFMT_NOGENSEARCH | AVFMT_NO_BYTE_SEEK,
.extensions = "shn",
.extensions = "shn",
.raw_codec_id = CODEC_ID_SHORTEN,
};
#endif

34
libavformat/rawenc.c
Unescape View File

@ -41,7 +41,7 @@ AVOutputFormat ff_ac3_muxer = {
.audio_codec = CODEC_ID_AC3,
.video_codec = CODEC_ID_NONE,
.write_packet = ff_raw_write_packet,
.flags= AVFMT_NOTIMESTAMPS,
.flags = AVFMT_NOTIMESTAMPS,
};
#endif
@ -65,7 +65,7 @@ AVOutputFormat ff_dirac_muxer = {
.audio_codec = CODEC_ID_NONE,
.video_codec = CODEC_ID_DIRAC,
.write_packet = ff_raw_write_packet,
.flags= AVFMT_NOTIMESTAMPS,
.flags = AVFMT_NOTIMESTAMPS,
};
#endif
@ -77,7 +77,7 @@ AVOutputFormat ff_dnxhd_muxer = {
.audio_codec = CODEC_ID_NONE,
.video_codec = CODEC_ID_DNXHD,
.write_packet = ff_raw_write_packet,
.flags= AVFMT_NOTIMESTAMPS,
.flags = AVFMT_NOTIMESTAMPS,
};
#endif
@ -90,7 +90,7 @@ AVOutputFormat ff_dts_muxer = {
.audio_codec = CODEC_ID_DTS,
.video_codec = CODEC_ID_NONE,
.write_packet = ff_raw_write_packet,
.flags= AVFMT_NOTIMESTAMPS,
.flags = AVFMT_NOTIMESTAMPS,
};
#endif
@ -103,7 +103,7 @@ AVOutputFormat ff_eac3_muxer = {
.audio_codec = CODEC_ID_EAC3,
.video_codec = CODEC_ID_NONE,
.write_packet = ff_raw_write_packet,
.flags= AVFMT_NOTIMESTAMPS,
.flags = AVFMT_NOTIMESTAMPS,
};
#endif
@ -116,7 +116,7 @@ AVOutputFormat ff_g722_muxer = {
.audio_codec = CODEC_ID_ADPCM_G722,
.video_codec = CODEC_ID_NONE,
.write_packet = ff_raw_write_packet,
.flags= AVFMT_NOTIMESTAMPS,
.flags = AVFMT_NOTIMESTAMPS,
};
#endif
@ -129,7 +129,7 @@ AVOutputFormat ff_h261_muxer = {
.audio_codec = CODEC_ID_NONE,
.video_codec = CODEC_ID_H261,
.write_packet = ff_raw_write_packet,
.flags= AVFMT_NOTIMESTAMPS,
.flags = AVFMT_NOTIMESTAMPS,
};
#endif
@ -142,7 +142,7 @@ AVOutputFormat ff_h263_muxer = {
.audio_codec = CODEC_ID_NONE,
.video_codec = CODEC_ID_H263,
.write_packet = ff_raw_write_packet,
.flags= AVFMT_NOTIMESTAMPS,
.flags = AVFMT_NOTIMESTAMPS,
};
#endif
@ -154,7 +154,7 @@ AVOutputFormat ff_h264_muxer = {
.audio_codec = CODEC_ID_NONE,
.video_codec = CODEC_ID_H264,
.write_packet = ff_raw_write_packet,
.flags= AVFMT_NOTIMESTAMPS,
.flags = AVFMT_NOTIMESTAMPS,
};
#endif
@ -166,7 +166,7 @@ AVOutputFormat ff_cavsvideo_muxer = {
.audio_codec = CODEC_ID_NONE,
.video_codec = CODEC_ID_CAVS,
.write_packet = ff_raw_write_packet,
.flags= AVFMT_NOTIMESTAMPS,
.flags = AVFMT_NOTIMESTAMPS,
};
#endif
@ -178,7 +178,7 @@ AVOutputFormat ff_m4v_muxer = {
.audio_codec = CODEC_ID_NONE,
.video_codec = CODEC_ID_MPEG4,
.write_packet = ff_raw_write_packet,
.flags= AVFMT_NOTIMESTAMPS,
.flags = AVFMT_NOTIMESTAMPS,
};
#endif
@ -191,7 +191,7 @@ AVOutputFormat ff_mjpeg_muxer = {
.audio_codec = CODEC_ID_NONE,
.video_codec = CODEC_ID_MJPEG,
.write_packet = ff_raw_write_packet,
.flags= AVFMT_NOTIMESTAMPS,
.flags = AVFMT_NOTIMESTAMPS,
};
#endif
@ -203,7 +203,7 @@ AVOutputFormat ff_mlp_muxer = {
.audio_codec = CODEC_ID_MLP,
.video_codec = CODEC_ID_NONE,
.write_packet = ff_raw_write_packet,
.flags= AVFMT_NOTIMESTAMPS,
.flags = AVFMT_NOTIMESTAMPS,
};
#endif
@ -227,7 +227,7 @@ AVOutputFormat ff_truehd_muxer = {
.audio_codec = CODEC_ID_TRUEHD,
.video_codec = CODEC_ID_NONE,
.write_packet = ff_raw_write_packet,
.flags= AVFMT_NOTIMESTAMPS,
.flags = AVFMT_NOTIMESTAMPS,
};
#endif
@ -240,7 +240,7 @@ AVOutputFormat ff_mpeg1video_muxer = {
.audio_codec = CODEC_ID_NONE,
.video_codec = CODEC_ID_MPEG1VIDEO,
.write_packet = ff_raw_write_packet,
.flags= AVFMT_NOTIMESTAMPS,
.flags = AVFMT_NOTIMESTAMPS,
};
#endif
@ -252,7 +252,7 @@ AVOutputFormat ff_mpeg2video_muxer = {
.audio_codec = CODEC_ID_NONE,
.video_codec = CODEC_ID_MPEG2VIDEO,
.write_packet = ff_raw_write_packet,
.flags= AVFMT_NOTIMESTAMPS,
.flags = AVFMT_NOTIMESTAMPS,
};
#endif
@ -264,6 +264,6 @@ AVOutputFormat ff_rawvideo_muxer = {
.audio_codec = CODEC_ID_NONE,
.video_codec = CODEC_ID_RAWVIDEO,
.write_packet = ff_raw_write_packet,
.flags= AVFMT_NOTIMESTAMPS,
.flags = AVFMT_NOTIMESTAMPS,
};
#endif

6
libavformat/rawvideodec.c
Unescape View File

@ -66,8 +66,8 @@ AVInputFormat ff_rawvideo_demuxer = {
.priv_data_size = sizeof(FFRawVideoDemuxerContext),
.read_header = ff_raw_read_header,
.read_packet = rawvideo_read_packet,
.flags= AVFMT_GENERIC_INDEX,
.extensions = "yuv,cif,qcif,rgb",
.flags = AVFMT_GENERIC_INDEX,
.extensions = "yuv,cif,qcif,rgb",
.raw_codec_id = CODEC_ID_RAWVIDEO,
.priv_class = &rawvideo_demuxer_class,
.priv_class = &rawvideo_demuxer_class,
};

2
libavformat/rmenc.c
Unescape View File

@ -471,5 +471,5 @@ AVOutputFormat ff_rm_muxer = {
.write_header = rm_write_header,
.write_packet = rm_write_packet,
.write_trailer = rm_write_trailer,
.codec_tag= (const AVCodecTag* const []){ff_rm_codec_tags, 0},
.codec_tag = (const AVCodecTag* const []){ ff_rm_codec_tags, 0 },
};

2
libavformat/rtpenc.c
Unescape View File

@ -503,5 +503,5 @@ AVOutputFormat ff_rtp_muxer = {
.write_header = rtp_write_header,
.write_packet = rtp_write_packet,
.write_trailer = rtp_write_trailer,
.priv_class = &rtp_muxer_class,
.priv_class = &rtp_muxer_class,
};

2
libavformat/sapdec.c
Unescape View File

@ -234,5 +234,5 @@ AVInputFormat ff_sap_demuxer = {
.read_header = sap_read_header,
.read_packet = sap_fetch_packet,
.read_close = sap_read_close,
.flags = AVFMT_NOFILE,
.flags = AVFMT_NOFILE,
};

2
libavformat/sapenc.c
Unescape View File

@ -258,5 +258,5 @@ AVOutputFormat ff_sap_muxer = {
.write_header = sap_write_header,
.write_packet = sap_write_packet,
.write_trailer = sap_write_close,
.flags = AVFMT_NOFILE | AVFMT_GLOBALHEADER,
.flags = AVFMT_NOFILE | AVFMT_GLOBALHEADER,
};

2
libavformat/siff.c
Unescape View File

@ -237,5 +237,5 @@ AVInputFormat ff_siff_demuxer = {
.read_probe = siff_probe,
.read_header = siff_read_header,
.read_packet = siff_read_packet,
.extensions = "vb,son"
.extensions = "vb,son",
};

2
libavformat/spdifdec.c
Unescape View File

@ -231,5 +231,5 @@ AVInputFormat ff_spdif_demuxer = {
.read_probe = spdif_probe,
.read_header = spdif_read_header,
.read_packet = spdif_read_packet,
.flags = AVFMT_GENERIC_INDEX,
.flags = AVFMT_GENERIC_INDEX,
};

4
libavformat/spdifenc.c
Unescape View File

@ -553,6 +553,6 @@ AVOutputFormat ff_spdif_muxer = {
.write_header = spdif_write_header,
.write_packet = spdif_write_packet,
.write_trailer = spdif_write_trailer,
.flags = AVFMT_NOTIMESTAMPS,
.priv_class = &class,
.flags = AVFMT_NOTIMESTAMPS,
.priv_class = &class,
};

2
libavformat/tmv.c
Unescape View File

@ -188,5 +188,5 @@ AVInputFormat ff_tmv_demuxer = {
.read_header = tmv_read_header,
.read_packet = tmv_read_packet,
.read_seek = tmv_read_seek,
.flags = AVFMT_GENERIC_INDEX,
.flags = AVFMT_GENERIC_INDEX,
};

2
libavformat/tta.c
Unescape View File

@ -166,5 +166,5 @@ AVInputFormat ff_tta_demuxer = {
.read_header = tta_read_header,
.read_packet = tta_read_packet,
.read_seek = tta_read_seek,
.extensions = "tta",
.extensions = "tta",
};

2
libavformat/vc1test.c
Unescape View File

@ -115,5 +115,5 @@ AVInputFormat ff_vc1t_demuxer = {
.read_probe = vc1t_probe,
.read_header = vc1t_read_header,
.read_packet = vc1t_read_packet,
.flags = AVFMT_GENERIC_INDEX,
.flags = AVFMT_GENERIC_INDEX,
};

2
libavformat/vocdec.c
Unescape View File

@ -171,5 +171,5 @@ AVInputFormat ff_voc_demuxer = {
.read_probe = voc_probe,
.read_header = voc_read_header,
.read_packet = voc_read_packet,
.codec_tag=(const AVCodecTag* const []){ff_voc_codec_tags, 0},
.codec_tag = (const AVCodecTag* const []){ ff_voc_codec_tags, 0 },
};

2
libavformat/vocenc.c
Unescape View File

@ -100,5 +100,5 @@ AVOutputFormat ff_voc_muxer = {
.write_header = voc_write_header,
.write_packet = voc_write_packet,
.write_trailer = voc_write_trailer,
.codec_tag=(const AVCodecTag* const []){ff_voc_codec_tags, 0},
.codec_tag = (const AVCodecTag* const []){ ff_voc_codec_tags, 0 },
};

12
libavformat/wav.c
Unescape View File

@ -216,8 +216,8 @@ AVOutputFormat ff_wav_muxer = {
.write_header = wav_write_header,
.write_packet = wav_write_packet,
.write_trailer = wav_write_trailer,
.codec_tag= (const AVCodecTag* const []){ff_codec_wav_tags, 0},
.priv_class = &wav_muxer_class,
.codec_tag = (const AVCodecTag* const []){ ff_codec_wav_tags, 0 },
.priv_class = &wav_muxer_class,
};
#endif /* CONFIG_WAV_MUXER */
@ -593,8 +593,8 @@ AVInputFormat ff_wav_demuxer = {
.read_header = wav_read_header,
.read_packet = wav_read_packet,
.read_seek = wav_read_seek,
.flags= AVFMT_GENERIC_INDEX,
.codec_tag= (const AVCodecTag* const []){ff_codec_wav_tags, 0},
.flags = AVFMT_GENERIC_INDEX,
.codec_tag = (const AVCodecTag* const []){ ff_codec_wav_tags, 0 },
};
#endif /* CONFIG_WAV_DEMUXER */
@ -681,7 +681,7 @@ AVInputFormat ff_w64_demuxer = {
.read_header = w64_read_header,
.read_packet = wav_read_packet,
.read_seek = wav_read_seek,
.flags = AVFMT_GENERIC_INDEX,
.codec_tag = (const AVCodecTag* const []){ff_codec_wav_tags, 0},
.flags = AVFMT_GENERIC_INDEX,
.codec_tag = (const AVCodecTag* const []){ ff_codec_wav_tags, 0 },
};
#endif /* CONFIG_W64_DEMUXER */

4
libavformat/yop.c
Unescape View File

@ -213,6 +213,6 @@ AVInputFormat ff_yop_demuxer = {
.read_packet = yop_read_packet,
.read_close = yop_read_close,
.read_seek = yop_read_seek,
.extensions = "yop",
.flags = AVFMT_GENERIC_INDEX,
.extensions = "yop",
.flags = AVFMT_GENERIC_INDEX,
};

2
libavformat/yuv4mpeg.c
Unescape View File

@ -419,6 +419,6 @@ AVInputFormat ff_yuv4mpegpipe_demuxer = {
.read_probe = yuv4_probe,
.read_header = yuv4_read_header,
.read_packet = yuv4_read_packet,
.extensions = "y4m"
.extensions = "y4m",
};
#endif

Write Preview
Loading…
Cancel
Save