comparison asf.c @ 1167:d89d7ef290da libavformat

give AVInput/OutputFormat structs consistent names
author mru
date Sun, 09 Jul 2006 23:40:53 +0000
parents 801d4a5cf353
children d18cc9a1fd02
comparison
equal deleted inserted replaced
1166:e89500dd9064 1167:d89d7ef290da
838 838
839 asf_reset_header(s); 839 asf_reset_header(s);
840 return 0; 840 return 0;
841 } 841 }
842 842
843 static AVInputFormat asf_iformat = { 843 static AVInputFormat asf_demuxer = {
844 "asf", 844 "asf",
845 "asf format", 845 "asf format",
846 sizeof(ASFContext), 846 sizeof(ASFContext),
847 asf_probe, 847 asf_probe,
848 asf_read_header, 848 asf_read_header,
851 asf_read_seek, 851 asf_read_seek,
852 asf_read_pts, 852 asf_read_pts,
853 }; 853 };
854 854
855 #ifdef CONFIG_MUXERS 855 #ifdef CONFIG_MUXERS
856 extern AVOutputFormat asf_oformat; 856 extern AVOutputFormat asf_muxer;
857 extern AVOutputFormat asf_stream_oformat; 857 extern AVOutputFormat asf_stream_muxer;
858 #endif //CONFIG_MUXERS 858 #endif //CONFIG_MUXERS
859 859
860 int asf_init(void) 860 int asf_init(void)
861 { 861 {
862 av_register_input_format(&asf_iformat); 862 av_register_input_format(&asf_demuxer);
863 #ifdef CONFIG_MUXERS 863 #ifdef CONFIG_MUXERS
864 av_register_output_format(&asf_oformat); 864 av_register_output_format(&asf_muxer);
865 av_register_output_format(&asf_stream_oformat); 865 av_register_output_format(&asf_stream_muxer);
866 #endif //CONFIG_MUXERS 866 #endif //CONFIG_MUXERS
867 return 0; 867 return 0;
868 } 868 }