... | ... |
@@ -61,9 +61,9 @@ static av_cold int aac_parse_init(AVCodecParserContext *s1) |
61 | 61 |
|
62 | 62 |
|
63 | 63 |
AVCodecParser ff_aac_parser = { |
64 |
- { CODEC_ID_AAC }, |
|
65 |
- sizeof(AACAC3ParseContext), |
|
66 |
- aac_parse_init, |
|
67 |
- ff_aac_ac3_parse, |
|
68 |
- ff_parse_close, |
|
64 |
+ .codec_ids = { CODEC_ID_AAC }, |
|
65 |
+ .priv_data_size = sizeof(AACAC3ParseContext), |
|
66 |
+ .parser_init = aac_parse_init, |
|
67 |
+ .parser_parse = ff_aac_ac3_parse, |
|
68 |
+ .parser_close = ff_parse_close, |
|
69 | 69 |
}; |
... | ... |
@@ -174,9 +174,9 @@ static av_cold int ac3_parse_init(AVCodecParserContext *s1) |
174 | 174 |
|
175 | 175 |
|
176 | 176 |
AVCodecParser ff_ac3_parser = { |
177 |
- { CODEC_ID_AC3, CODEC_ID_EAC3 }, |
|
178 |
- sizeof(AACAC3ParseContext), |
|
179 |
- ac3_parse_init, |
|
180 |
- ff_aac_ac3_parse, |
|
181 |
- ff_parse_close, |
|
177 |
+ .codec_ids = { CODEC_ID_AC3, CODEC_ID_EAC3 }, |
|
178 |
+ .priv_data_size = sizeof(AACAC3ParseContext), |
|
179 |
+ .parser_init = ac3_parse_init, |
|
180 |
+ .parser_parse = ff_aac_ac3_parse, |
|
181 |
+ .parser_close = ff_parse_close, |
|
182 | 182 |
}; |
... | ... |
@@ -98,10 +98,9 @@ static int cavsvideo_parse(AVCodecParserContext *s, |
98 | 98 |
} |
99 | 99 |
|
100 | 100 |
AVCodecParser ff_cavsvideo_parser = { |
101 |
- { CODEC_ID_CAVS }, |
|
102 |
- sizeof(ParseContext1), |
|
103 |
- NULL, |
|
104 |
- cavsvideo_parse, |
|
105 |
- ff_parse1_close, |
|
106 |
- ff_mpeg4video_split, |
|
101 |
+ .codec_ids = { CODEC_ID_CAVS }, |
|
102 |
+ .priv_data_size = sizeof(ParseContext1), |
|
103 |
+ .parser_parse = cavsvideo_parse, |
|
104 |
+ .parser_close = ff_parse1_close, |
|
105 |
+ .split = ff_mpeg4video_split, |
|
107 | 106 |
}; |
... | ... |
@@ -126,9 +126,9 @@ static int dca_parse(AVCodecParserContext * s, |
126 | 126 |
} |
127 | 127 |
|
128 | 128 |
AVCodecParser ff_dca_parser = { |
129 |
- {CODEC_ID_DTS}, |
|
130 |
- sizeof(DCAParseContext), |
|
131 |
- dca_parse_init, |
|
132 |
- dca_parse, |
|
133 |
- ff_parse_close, |
|
129 |
+ .codec_ids = { CODEC_ID_DTS }, |
|
130 |
+ .priv_data_size = sizeof(DCAParseContext), |
|
131 |
+ .parser_init = dca_parse_init, |
|
132 |
+ .parser_parse = dca_parse, |
|
133 |
+ .parser_close = ff_parse_close, |
|
134 | 134 |
}; |
... | ... |
@@ -248,9 +248,8 @@ static void dirac_parse_close(AVCodecParserContext *s) |
248 | 248 |
} |
249 | 249 |
|
250 | 250 |
AVCodecParser ff_dirac_parser = { |
251 |
- { CODEC_ID_DIRAC }, |
|
252 |
- sizeof(DiracParseContext), |
|
253 |
- NULL, |
|
254 |
- dirac_parse, |
|
255 |
- dirac_parse_close, |
|
251 |
+ .codec_ids = { CODEC_ID_DIRAC }, |
|
252 |
+ .priv_data_size = sizeof(DiracParseContext), |
|
253 |
+ .parser_parse = dirac_parse, |
|
254 |
+ .parser_close = dirac_parse_close, |
|
256 | 255 |
}; |
... | ... |
@@ -87,9 +87,8 @@ static int dnxhd_parse(AVCodecParserContext *s, |
87 | 87 |
} |
88 | 88 |
|
89 | 89 |
AVCodecParser ff_dnxhd_parser = { |
90 |
- { CODEC_ID_DNXHD }, |
|
91 |
- sizeof(ParseContext), |
|
92 |
- NULL, |
|
93 |
- dnxhd_parse, |
|
94 |
- ff_parse_close, |
|
90 |
+ .codec_ids = { CODEC_ID_DNXHD }, |
|
91 |
+ .priv_data_size = sizeof(ParseContext), |
|
92 |
+ .parser_parse = dnxhd_parse, |
|
93 |
+ .parser_close = ff_parse_close, |
|
95 | 94 |
}; |
... | ... |
@@ -172,9 +172,9 @@ static av_cold void dvbsub_parse_close(AVCodecParserContext *s) |
172 | 172 |
} |
173 | 173 |
|
174 | 174 |
AVCodecParser ff_dvbsub_parser = { |
175 |
- { CODEC_ID_DVB_SUBTITLE }, |
|
176 |
- sizeof(DVBSubParseContext), |
|
177 |
- dvbsub_parse_init, |
|
178 |
- dvbsub_parse, |
|
179 |
- dvbsub_parse_close, |
|
175 |
+ .codec_ids = { CODEC_ID_DVB_SUBTITLE }, |
|
176 |
+ .priv_data_size = sizeof(DVBSubParseContext), |
|
177 |
+ .parser_init = dvbsub_parse_init, |
|
178 |
+ .parser_parse = dvbsub_parse, |
|
179 |
+ .parser_close = dvbsub_parse_close, |
|
180 | 180 |
}; |
... | ... |
@@ -77,9 +77,9 @@ static av_cold void dvdsub_parse_close(AVCodecParserContext *s) |
77 | 77 |
} |
78 | 78 |
|
79 | 79 |
AVCodecParser ff_dvdsub_parser = { |
80 |
- { CODEC_ID_DVD_SUBTITLE }, |
|
81 |
- sizeof(DVDSubParseContext), |
|
82 |
- dvdsub_parse_init, |
|
83 |
- dvdsub_parse, |
|
84 |
- dvdsub_parse_close, |
|
80 |
+ .codec_ids = { CODEC_ID_DVD_SUBTITLE }, |
|
81 |
+ .priv_data_size = sizeof(DVDSubParseContext), |
|
82 |
+ .parser_init = dvdsub_parse_init, |
|
83 |
+ .parser_parse = dvdsub_parse, |
|
84 |
+ .parser_close = dvdsub_parse_close, |
|
85 | 85 |
}; |
... | ... |
@@ -674,9 +674,9 @@ static void flac_parse_close(AVCodecParserContext *c) |
674 | 674 |
} |
675 | 675 |
|
676 | 676 |
AVCodecParser ff_flac_parser = { |
677 |
- { CODEC_ID_FLAC }, |
|
678 |
- sizeof(FLACParseContext), |
|
679 |
- flac_parse_init, |
|
680 |
- flac_parse, |
|
681 |
- flac_parse_close, |
|
677 |
+ .codec_ids = { CODEC_ID_FLAC }, |
|
678 |
+ .priv_data_size = sizeof(FLACParseContext), |
|
679 |
+ .parser_init = flac_parse_init, |
|
680 |
+ .parser_parse = flac_parse, |
|
681 |
+ .parser_close = flac_parse_close, |
|
682 | 682 |
}; |
... | ... |
@@ -82,9 +82,8 @@ static int h261_parse(AVCodecParserContext *s, |
82 | 82 |
} |
83 | 83 |
|
84 | 84 |
AVCodecParser ff_h261_parser = { |
85 |
- { CODEC_ID_H261 }, |
|
86 |
- sizeof(ParseContext), |
|
87 |
- NULL, |
|
88 |
- h261_parse, |
|
89 |
- ff_parse_close, |
|
85 |
+ .codec_ids = { CODEC_ID_H261 }, |
|
86 |
+ .priv_data_size = sizeof(ParseContext), |
|
87 |
+ .parser_parse = h261_parse, |
|
88 |
+ .parser_close = ff_parse_close, |
|
90 | 89 |
}; |
... | ... |
@@ -84,9 +84,8 @@ static int h263_parse(AVCodecParserContext *s, |
84 | 84 |
} |
85 | 85 |
|
86 | 86 |
AVCodecParser ff_h263_parser = { |
87 |
- { CODEC_ID_H263 }, |
|
88 |
- sizeof(ParseContext), |
|
89 |
- NULL, |
|
90 |
- h263_parse, |
|
91 |
- ff_parse_close, |
|
87 |
+ .codec_ids = { CODEC_ID_H263 }, |
|
88 |
+ .priv_data_size = sizeof(ParseContext), |
|
89 |
+ .parser_parse = h263_parse, |
|
90 |
+ .parser_close = ff_parse_close, |
|
92 | 91 |
}; |
... | ... |
@@ -334,10 +334,10 @@ static int init(AVCodecParserContext *s) |
334 | 334 |
} |
335 | 335 |
|
336 | 336 |
AVCodecParser ff_h264_parser = { |
337 |
- { CODEC_ID_H264 }, |
|
338 |
- sizeof(H264Context), |
|
339 |
- init, |
|
340 |
- h264_parse, |
|
341 |
- close, |
|
342 |
- h264_split, |
|
337 |
+ .codec_ids = { CODEC_ID_H264 }, |
|
338 |
+ .priv_data_size = sizeof(H264Context), |
|
339 |
+ .parser_init = init, |
|
340 |
+ .parser_parse = h264_parse, |
|
341 |
+ .parser_close = close, |
|
342 |
+ .split = h264_split, |
|
343 | 343 |
}; |
... | ... |
@@ -106,9 +106,8 @@ static int latm_parse(AVCodecParserContext *s1, AVCodecContext *avctx, |
106 | 106 |
} |
107 | 107 |
|
108 | 108 |
AVCodecParser ff_aac_latm_parser = { |
109 |
- { CODEC_ID_AAC_LATM }, |
|
110 |
- sizeof(LATMParseContext), |
|
111 |
- NULL, |
|
112 |
- latm_parse, |
|
113 |
- ff_parse_close |
|
109 |
+ .codec_ids = { CODEC_ID_AAC_LATM }, |
|
110 |
+ .priv_data_size = sizeof(LATMParseContext), |
|
111 |
+ .parser_parse = latm_parse, |
|
112 |
+ .parser_close = ff_parse_close |
|
114 | 113 |
}; |
... | ... |
@@ -97,9 +97,8 @@ static int jpeg_parse(AVCodecParserContext *s, |
97 | 97 |
|
98 | 98 |
|
99 | 99 |
AVCodecParser ff_mjpeg_parser = { |
100 |
- { CODEC_ID_MJPEG }, |
|
101 |
- sizeof(ParseContext), |
|
102 |
- NULL, |
|
103 |
- jpeg_parse, |
|
104 |
- ff_parse_close, |
|
100 |
+ .codec_ids = { CODEC_ID_MJPEG }, |
|
101 |
+ .priv_data_size = sizeof(ParseContext), |
|
102 |
+ .parser_parse = jpeg_parse, |
|
103 |
+ .parser_close = ff_parse_close, |
|
105 | 104 |
}; |
... | ... |
@@ -345,9 +345,9 @@ lost_sync: |
345 | 345 |
} |
346 | 346 |
|
347 | 347 |
AVCodecParser ff_mlp_parser = { |
348 |
- { CODEC_ID_MLP, CODEC_ID_TRUEHD }, |
|
349 |
- sizeof(MLPParseContext), |
|
350 |
- mlp_init, |
|
351 |
- mlp_parse, |
|
352 |
- ff_parse_close, |
|
348 |
+ .codec_ids = { CODEC_ID_MLP, CODEC_ID_TRUEHD }, |
|
349 |
+ .priv_data_size = sizeof(MLPParseContext), |
|
350 |
+ .parser_init = mlp_init, |
|
351 |
+ .parser_parse = mlp_parse, |
|
352 |
+ .parser_close = ff_parse_close, |
|
353 | 353 |
}; |
... | ... |
@@ -130,10 +130,10 @@ static int mpeg4video_parse(AVCodecParserContext *s, |
130 | 130 |
|
131 | 131 |
|
132 | 132 |
AVCodecParser ff_mpeg4video_parser = { |
133 |
- { CODEC_ID_MPEG4 }, |
|
134 |
- sizeof(ParseContext1), |
|
135 |
- mpeg4video_parse_init, |
|
136 |
- mpeg4video_parse, |
|
137 |
- ff_parse1_close, |
|
138 |
- ff_mpeg4video_split, |
|
133 |
+ .codec_ids = { CODEC_ID_MPEG4 }, |
|
134 |
+ .priv_data_size = sizeof(ParseContext1), |
|
135 |
+ .parser_init = mpeg4video_parse_init, |
|
136 |
+ .parser_parse = mpeg4video_parse, |
|
137 |
+ .parser_close = ff_parse1_close, |
|
138 |
+ .split = ff_mpeg4video_split, |
|
139 | 139 |
}; |
... | ... |
@@ -100,9 +100,8 @@ static int mpegaudio_parse(AVCodecParserContext *s1, |
100 | 100 |
|
101 | 101 |
|
102 | 102 |
AVCodecParser ff_mpegaudio_parser = { |
103 |
- { CODEC_ID_MP1, CODEC_ID_MP2, CODEC_ID_MP3 }, |
|
104 |
- sizeof(MpegAudioParseContext), |
|
105 |
- NULL, |
|
106 |
- mpegaudio_parse, |
|
107 |
- ff_parse_close, |
|
103 |
+ .codec_ids = { CODEC_ID_MP1, CODEC_ID_MP2, CODEC_ID_MP3 }, |
|
104 |
+ .priv_data_size = sizeof(MpegAudioParseContext), |
|
105 |
+ .parser_parse = mpegaudio_parse, |
|
106 |
+ .parser_close = ff_parse_close, |
|
108 | 107 |
}; |
... | ... |
@@ -174,10 +174,9 @@ static int mpegvideo_split(AVCodecContext *avctx, |
174 | 174 |
} |
175 | 175 |
|
176 | 176 |
AVCodecParser ff_mpegvideo_parser = { |
177 |
- { CODEC_ID_MPEG1VIDEO, CODEC_ID_MPEG2VIDEO }, |
|
178 |
- sizeof(ParseContext1), |
|
179 |
- NULL, |
|
180 |
- mpegvideo_parse, |
|
181 |
- ff_parse1_close, |
|
182 |
- mpegvideo_split, |
|
177 |
+ .codec_ids = { CODEC_ID_MPEG1VIDEO, CODEC_ID_MPEG2VIDEO }, |
|
178 |
+ .priv_data_size = sizeof(ParseContext1), |
|
179 |
+ .parser_parse = mpegvideo_parse, |
|
180 |
+ .parser_close = ff_parse1_close, |
|
181 |
+ .split = mpegvideo_split, |
|
183 | 182 |
}; |
... | ... |
@@ -84,9 +84,9 @@ retry: |
84 | 84 |
} |
85 | 85 |
|
86 | 86 |
AVCodecParser ff_pnm_parser = { |
87 |
- { CODEC_ID_PGM, CODEC_ID_PGMYUV, CODEC_ID_PPM, CODEC_ID_PBM, CODEC_ID_PAM}, |
|
88 |
- sizeof(ParseContext), |
|
89 |
- NULL, |
|
90 |
- pnm_parse, |
|
91 |
- ff_parse_close, |
|
87 |
+ .codec_ids = { CODEC_ID_PGM, CODEC_ID_PGMYUV, CODEC_ID_PPM, |
|
88 |
+ CODEC_ID_PBM, CODEC_ID_PAM }, |
|
89 |
+ .priv_data_size = sizeof(ParseContext), |
|
90 |
+ .parser_parse = pnm_parse, |
|
91 |
+ .parser_close = ff_parse_close, |
|
92 | 92 |
}; |
... | ... |
@@ -78,18 +78,16 @@ static int rv34_parse(AVCodecParserContext *s, |
78 | 78 |
|
79 | 79 |
#ifdef CONFIG_RV30_PARSER |
80 | 80 |
AVCodecParser ff_rv30_parser = { |
81 |
- { CODEC_ID_RV30 }, |
|
82 |
- sizeof(RV34ParseContext), |
|
83 |
- NULL, |
|
84 |
- rv34_parse, |
|
81 |
+ .codec_ids = { CODEC_ID_RV30 }, |
|
82 |
+ .priv_data_size = sizeof(RV34ParseContext), |
|
83 |
+ .parser_parse = rv34_parse, |
|
85 | 84 |
}; |
86 | 85 |
#endif |
87 | 86 |
|
88 | 87 |
#ifdef CONFIG_RV40_PARSER |
89 | 88 |
AVCodecParser ff_rv40_parser = { |
90 |
- { CODEC_ID_RV40 }, |
|
91 |
- sizeof(RV34ParseContext), |
|
92 |
- NULL, |
|
93 |
- rv34_parse, |
|
89 |
+ .codec_ids = { CODEC_ID_RV40 }, |
|
90 |
+ .priv_data_size = sizeof(RV34ParseContext), |
|
91 |
+ .parser_parse = rv34_parse, |
|
94 | 92 |
}; |
95 | 93 |
#endif |
... | ... |
@@ -185,10 +185,9 @@ static int vc1_split(AVCodecContext *avctx, |
185 | 185 |
} |
186 | 186 |
|
187 | 187 |
AVCodecParser ff_vc1_parser = { |
188 |
- { CODEC_ID_VC1 }, |
|
189 |
- sizeof(VC1ParseContext), |
|
190 |
- NULL, |
|
191 |
- vc1_parse, |
|
192 |
- ff_parse1_close, |
|
193 |
- vc1_split, |
|
188 |
+ .codec_ids = { CODEC_ID_VC1 }, |
|
189 |
+ .priv_data_size = sizeof(VC1ParseContext), |
|
190 |
+ .parser_parse = vc1_parse, |
|
191 |
+ .parser_close = ff_parse1_close, |
|
192 |
+ .split = vc1_split, |
|
194 | 193 |
}; |
... | ... |
@@ -36,9 +36,7 @@ static int parse(AVCodecParserContext *s, |
36 | 36 |
} |
37 | 37 |
|
38 | 38 |
AVCodecParser ff_vp3_parser = { |
39 |
- { CODEC_ID_THEORA, CODEC_ID_VP3, |
|
40 |
- CODEC_ID_VP6, CODEC_ID_VP6F, CODEC_ID_VP6A }, |
|
41 |
- 0, |
|
42 |
- NULL, |
|
43 |
- parse, |
|
39 |
+ .codec_ids = { CODEC_ID_THEORA, CODEC_ID_VP3, CODEC_ID_VP6, |
|
40 |
+ CODEC_ID_VP6F, CODEC_ID_VP6A }, |
|
41 |
+ .parser_parse = parse, |
|
44 | 42 |
}; |