Revision aa244b69 libavcodec/avcodec.h

View differences:

libavcodec/avcodec.h
2189 2189
} AVSubtitle;
2190 2190

  
2191 2191
extern AVCodec ac3_encoder;
2192
extern AVCodec amr_nb_encoder;
2193
extern AVCodec amr_wb_encoder;
2194 2192
extern AVCodec asv1_encoder;
2195 2193
extern AVCodec asv2_encoder;
2196 2194
extern AVCodec bmp_encoder;
2197 2195
extern AVCodec dvvideo_encoder;
2198
extern AVCodec faac_encoder;
2199 2196
extern AVCodec ffv1_encoder;
2200 2197
extern AVCodec ffvhuff_encoder;
2201 2198
extern AVCodec flac_encoder;
......
2208 2205
extern AVCodec h264_encoder;
2209 2206
extern AVCodec huffyuv_encoder;
2210 2207
extern AVCodec jpegls_encoder;
2211
extern AVCodec libgsm_encoder;
2212
extern AVCodec libgsm_ms_encoder;
2213
extern AVCodec libtheora_encoder;
2214 2208
extern AVCodec ljpeg_encoder;
2215 2209
extern AVCodec mdec_encoder;
2216 2210
extern AVCodec mjpeg_encoder;
2217 2211
extern AVCodec mp2_encoder;
2218
extern AVCodec mp3lame_encoder;
2219 2212
extern AVCodec mpeg1video_encoder;
2220 2213
extern AVCodec mpeg2video_encoder;
2221 2214
extern AVCodec mpeg4_encoder;
2222 2215
extern AVCodec msmpeg4v1_encoder;
2223 2216
extern AVCodec msmpeg4v2_encoder;
2224 2217
extern AVCodec msmpeg4v3_encoder;
2225
extern AVCodec oggvorbis_encoder;
2226 2218
extern AVCodec pam_encoder;
2227 2219
extern AVCodec pbm_encoder;
2228 2220
extern AVCodec pgm_encoder;
......
2244 2236
extern AVCodec wmav2_encoder;
2245 2237
extern AVCodec wmv1_encoder;
2246 2238
extern AVCodec wmv2_encoder;
2247
extern AVCodec x264_encoder;
2248
extern AVCodec xvid_encoder;
2249
extern AVCodec zlib_encoder;
2250 2239
extern AVCodec zmbv_encoder;
2251 2240

  
2252
extern AVCodec aac_decoder;
2253 2241
extern AVCodec aasc_decoder;
2254 2242
extern AVCodec alac_decoder;
2255
extern AVCodec amr_nb_decoder;
2256
extern AVCodec amr_wb_decoder;
2257 2243
extern AVCodec asv1_decoder;
2258 2244
extern AVCodec asv2_decoder;
2259 2245
extern AVCodec atrac3_decoder;
......
2295 2281
extern AVCodec interplay_dpcm_decoder;
2296 2282
extern AVCodec interplay_video_decoder;
2297 2283
extern AVCodec kmvc_decoder;
2298
extern AVCodec libgsm_decoder;
2299
extern AVCodec libgsm_ms_decoder;
2300 2284
extern AVCodec loco_decoder;
2301 2285
extern AVCodec mace3_decoder;
2302 2286
extern AVCodec mace6_decoder;
......
2312 2296
extern AVCodec mpeg1video_decoder;
2313 2297
extern AVCodec mpeg2video_decoder;
2314 2298
extern AVCodec mpeg4_decoder;
2315
extern AVCodec mpeg4aac_decoder;
2316 2299
extern AVCodec mpeg_xvmc_decoder;
2317 2300
extern AVCodec mpegvideo_decoder;
2318 2301
extern AVCodec msmpeg4v1_decoder;
......
2322 2305
extern AVCodec msvideo1_decoder;
2323 2306
extern AVCodec mszh_decoder;
2324 2307
extern AVCodec nuv_decoder;
2325
extern AVCodec oggvorbis_decoder;
2326 2308
extern AVCodec png_decoder;
2327 2309
extern AVCodec ptx_decoder;
2328 2310
extern AVCodec qdm2_decoder;
......
2382 2364
extern AVCodec xan_dpcm_decoder;
2383 2365
extern AVCodec xan_wc3_decoder;
2384 2366
extern AVCodec xl_decoder;
2385
extern AVCodec zlib_decoder;
2386 2367
extern AVCodec zmbv_decoder;
2387 2368

  
2388 2369
/* PCM codecs */
......
2436 2417
extern AVCodec rawvideo_decoder;
2437 2418
extern AVCodec rawvideo_encoder;
2438 2419

  
2439
/* the following codecs use external GPL libs */
2420
/* the following codecs use external libs */
2421
extern AVCodec aac_decoder;
2422
extern AVCodec amr_nb_decoder;
2423
extern AVCodec amr_nb_encoder;
2424
extern AVCodec amr_wb_decoder;
2425
extern AVCodec amr_wb_encoder;
2440 2426
extern AVCodec dts_decoder;
2427
extern AVCodec faac_encoder;
2441 2428
extern AVCodec liba52_decoder;
2429
extern AVCodec libgsm_decoder;
2430
extern AVCodec libgsm_encoder;
2431
extern AVCodec libgsm_ms_decoder;
2432
extern AVCodec libgsm_ms_encoder;
2433
extern AVCodec libtheora_encoder;
2434
extern AVCodec mp3lame_encoder;
2435
extern AVCodec mpeg4aac_decoder;
2436
extern AVCodec oggvorbis_decoder;
2437
extern AVCodec oggvorbis_encoder;
2438
extern AVCodec x264_encoder;
2439
extern AVCodec xvid_encoder;
2440
extern AVCodec zlib_decoder;
2441
extern AVCodec zlib_encoder;
2442 2442

  
2443 2443
/* subtitles */
2444 2444
extern AVCodec dvbsub_decoder;

Also available in: Unified diff