Browse code

Eliminate pointless 0/NULL initializers in AVCodec and similar declarations.

Diego Biurrun authored on 2011/11/27 02:35:26
Showing 18 changed files
... ...
@@ -443,7 +443,6 @@ AVHWAccel ff_h264_dxva2_hwaccel = {
443 443
     .type           = AVMEDIA_TYPE_VIDEO,
444 444
     .id             = CODEC_ID_H264,
445 445
     .pix_fmt        = PIX_FMT_DXVA2_VLD,
446
-    .capabilities   = 0,
447 446
     .start_frame    = start_frame,
448 447
     .decode_slice   = decode_slice,
449 448
     .end_frame      = end_frame,
... ...
@@ -265,7 +265,6 @@ AVHWAccel ff_mpeg2_dxva2_hwaccel = {
265 265
     .type           = AVMEDIA_TYPE_VIDEO,
266 266
     .id             = CODEC_ID_MPEG2VIDEO,
267 267
     .pix_fmt        = PIX_FMT_DXVA2_VLD,
268
-    .capabilities   = 0,
269 268
     .start_frame    = start_frame,
270 269
     .decode_slice   = decode_slice,
271 270
     .end_frame      = end_frame,
... ...
@@ -269,7 +269,6 @@ AVHWAccel ff_wmv3_dxva2_hwaccel = {
269 269
     .type           = AVMEDIA_TYPE_VIDEO,
270 270
     .id             = CODEC_ID_WMV3,
271 271
     .pix_fmt        = PIX_FMT_DXVA2_VLD,
272
-    .capabilities   = 0,
273 272
     .start_frame    = start_frame,
274 273
     .decode_slice   = decode_slice,
275 274
     .end_frame      = end_frame,
... ...
@@ -282,7 +281,6 @@ AVHWAccel ff_vc1_dxva2_hwaccel = {
282 282
     .type           = AVMEDIA_TYPE_VIDEO,
283 283
     .id             = CODEC_ID_VC1,
284 284
     .pix_fmt        = PIX_FMT_DXVA2_VLD,
285
-    .capabilities   = 0,
286 285
     .start_frame    = start_frame,
287 286
     .decode_slice   = decode_slice,
288 287
     .end_frame      = end_frame,
... ...
@@ -108,6 +108,5 @@ static int mjpeg2jpeg_filter(AVBitStreamFilterContext *bsfc,
108 108
 
109 109
 AVBitStreamFilter ff_mjpeg2jpeg_bsf = {
110 110
     .name           = "mjpeg2jpeg",
111
-    .priv_data_size = 0,
112 111
     .filter         = mjpeg2jpeg_filter,
113 112
 };
... ...
@@ -134,7 +134,6 @@ AVCodec ff_s302m_decoder = {
134 134
     .name           = "s302m",
135 135
     .type           = AVMEDIA_TYPE_AUDIO,
136 136
     .id             = CODEC_ID_S302M,
137
-    .priv_data_size = 0,
138 137
     .decode         = s302m_decode_frame,
139 138
     .long_name      = NULL_IF_CONFIG_SMALL("SMPTE 302M"),
140 139
 };
... ...
@@ -341,9 +341,7 @@ AVHWAccel ff_h264_vaapi_hwaccel = {
341 341
     .type           = AVMEDIA_TYPE_VIDEO,
342 342
     .id             = CODEC_ID_H264,
343 343
     .pix_fmt        = PIX_FMT_VAAPI_VLD,
344
-    .capabilities   = 0,
345 344
     .start_frame    = start_frame,
346 345
     .end_frame      = end_frame,
347 346
     .decode_slice   = decode_slice,
348
-    .priv_data_size = 0,
349 347
 };
... ...
@@ -143,9 +143,7 @@ AVHWAccel ff_mpeg2_vaapi_hwaccel = {
143 143
     .type           = AVMEDIA_TYPE_VIDEO,
144 144
     .id             = CODEC_ID_MPEG2VIDEO,
145 145
     .pix_fmt        = PIX_FMT_VAAPI_VLD,
146
-    .capabilities   = 0,
147 146
     .start_frame    = vaapi_mpeg2_start_frame,
148 147
     .end_frame      = vaapi_mpeg2_end_frame,
149 148
     .decode_slice   = vaapi_mpeg2_decode_slice,
150
-    .priv_data_size = 0,
151 149
 };
... ...
@@ -155,11 +155,9 @@ AVHWAccel ff_mpeg4_vaapi_hwaccel = {
155 155
     .type           = AVMEDIA_TYPE_VIDEO,
156 156
     .id             = CODEC_ID_MPEG4,
157 157
     .pix_fmt        = PIX_FMT_VAAPI_VLD,
158
-    .capabilities   = 0,
159 158
     .start_frame    = vaapi_mpeg4_start_frame,
160 159
     .end_frame      = vaapi_mpeg4_end_frame,
161 160
     .decode_slice   = vaapi_mpeg4_decode_slice,
162
-    .priv_data_size = 0,
163 161
 };
164 162
 #endif
165 163
 
... ...
@@ -169,10 +167,8 @@ AVHWAccel ff_h263_vaapi_hwaccel = {
169 169
     .type           = AVMEDIA_TYPE_VIDEO,
170 170
     .id             = CODEC_ID_H263,
171 171
     .pix_fmt        = PIX_FMT_VAAPI_VLD,
172
-    .capabilities   = 0,
173 172
     .start_frame    = vaapi_mpeg4_start_frame,
174 173
     .end_frame      = vaapi_mpeg4_end_frame,
175 174
     .decode_slice   = vaapi_mpeg4_decode_slice,
176
-    .priv_data_size = 0,
177 175
 };
178 176
 #endif
... ...
@@ -346,11 +346,9 @@ AVHWAccel ff_wmv3_vaapi_hwaccel = {
346 346
     .type           = AVMEDIA_TYPE_VIDEO,
347 347
     .id             = CODEC_ID_WMV3,
348 348
     .pix_fmt        = PIX_FMT_VAAPI_VLD,
349
-    .capabilities   = 0,
350 349
     .start_frame    = vaapi_vc1_start_frame,
351 350
     .end_frame      = vaapi_vc1_end_frame,
352 351
     .decode_slice   = vaapi_vc1_decode_slice,
353
-    .priv_data_size = 0,
354 352
 };
355 353
 #endif
356 354
 
... ...
@@ -359,9 +357,7 @@ AVHWAccel ff_vc1_vaapi_hwaccel = {
359 359
     .type           = AVMEDIA_TYPE_VIDEO,
360 360
     .id             = CODEC_ID_VC1,
361 361
     .pix_fmt        = PIX_FMT_VAAPI_VLD,
362
-    .capabilities   = 0,
363 362
     .start_frame    = vaapi_vc1_start_frame,
364 363
     .end_frame      = vaapi_vc1_end_frame,
365 364
     .decode_slice   = vaapi_vc1_decode_slice,
366
-    .priv_data_size = 0,
367 365
 };
... ...
@@ -102,7 +102,6 @@ AVHWAccel ff_h264_vda_hwaccel = {
102 102
     .type           = AVMEDIA_TYPE_VIDEO,
103 103
     .id             = CODEC_ID_H264,
104 104
     .pix_fmt        = PIX_FMT_VDA_VLD,
105
-    .capabilities   = 0,
106 105
     .start_frame    = start_frame,
107 106
     .decode_slice   = decode_slice,
108 107
     .end_frame      = end_frame,
... ...
@@ -166,7 +166,6 @@ static int a64_write_trailer(struct AVFormatContext *s)
166 166
 AVOutputFormat ff_a64_muxer = {
167 167
     .name = "a64",
168 168
     .long_name = NULL_IF_CONFIG_SMALL("a64 - video for Commodore 64"),
169
-    .mime_type = NULL,
170 169
     .extensions = "a64, A64",
171 170
     .priv_data_size = sizeof (A64Context),
172 171
     .video_codec = CODEC_ID_A64_MULTI,
... ...
@@ -176,7 +176,6 @@ static int amr_read_packet(AVFormatContext *s,
176 176
 AVInputFormat ff_amr_demuxer = {
177 177
     .name           = "amr",
178 178
     .long_name      = NULL_IF_CONFIG_SMALL("3GPP AMR file format"),
179
-    .priv_data_size = 0, /*priv_data_size*/
180 179
     .read_probe     = amr_probe,
181 180
     .read_header    = amr_read_header,
182 181
     .read_packet    = amr_read_packet,
... ...
@@ -366,7 +366,5 @@ URLProtocol ff_mmsh_protocol = {
366 366
     .name      = "mmsh",
367 367
     .url_open  = mmsh_open,
368 368
     .url_read  = mmsh_read,
369
-    .url_write = NULL,
370
-    .url_seek  = NULL,
371 369
     .url_close = mmsh_close,
372 370
 };
... ...
@@ -614,7 +614,6 @@ AVInputFormat ff_mpegps_demuxer = {
614 614
     .read_probe     = mpegps_probe,
615 615
     .read_header    = mpegps_read_header,
616 616
     .read_packet    = mpegps_read_packet,
617
-    .read_seek      = NULL, //mpegps_read_seek,
618 617
     .read_timestamp = mpegps_read_dts,
619 618
     .flags = AVFMT_SHOW_IDS|AVFMT_TS_DISCONT,
620 619
 };
... ...
@@ -92,11 +92,8 @@ AVInputFormat ff_rso_demuxer = {
92 92
     .name           =   "rso",
93 93
     .long_name      =   NULL_IF_CONFIG_SMALL("Lego Mindstorms RSO format"),
94 94
     .extensions     =   "rso",
95
-    .priv_data_size =   0,
96
-    .read_probe     =   NULL, /* no magic value in this format */
97 95
     .read_header    =   rso_read_header,
98 96
     .read_packet    =   rso_read_packet,
99
-    .read_close     =   NULL,
100 97
     .read_seek      =   pcm_read_seek,
101 98
     .codec_tag      =   (const AVCodecTag* const []){ff_codec_rso_tags, 0},
102 99
 };
... ...
@@ -104,7 +104,6 @@ AVOutputFormat ff_rso_muxer = {
104 104
     .name           =   "rso",
105 105
     .long_name      =   NULL_IF_CONFIG_SMALL("Lego Mindstorms RSO format"),
106 106
     .extensions     =   "rso",
107
-    .priv_data_size =   0,
108 107
     .audio_codec    =   CODEC_ID_PCM_U8,
109 108
     .video_codec    =   CODEC_ID_NONE,
110 109
     .write_header   =   rso_write_header,
... ...
@@ -234,9 +234,6 @@ RTPDynamicProtocolHandler ff_mp4v_es_dynamic_handler = {
234 234
     .codec_type         = AVMEDIA_TYPE_VIDEO,
235 235
     .codec_id           = CODEC_ID_MPEG4,
236 236
     .parse_sdp_a_line   = parse_sdp_line,
237
-    .alloc              = NULL,
238
-    .free               = NULL,
239
-    .parse_packet       = NULL
240 237
 };
241 238
 
242 239
 RTPDynamicProtocolHandler ff_mpeg4_generic_dynamic_handler = {
... ...
@@ -246,7 +246,6 @@ URLProtocol ff_tls_protocol = {
246 246
     .url_open       = tls_open,
247 247
     .url_read       = tls_read,
248 248
     .url_write      = tls_write,
249
-    .url_seek       = NULL,
250 249
     .url_close      = tls_close,
251 250
     .priv_data_size = sizeof(TLSContext),
252 251
 };