cosmetics: Group all external library decoders and encoders together.

Originally committed as revision 8868 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h
index 56ff6630a38ecbe6427f2427909b519b873ef560..3a90098dd4d060d29d3d60b1e80e7339a0cfb7f5 100644 (file)
--- a/libavcodec/avcodec.h
+++ b/libavcodec/avcodec.h
@@ -2189,13 +2189,10 @@ typedef struct AVSubtitle {
 } AVSubtitle;
 
 extern AVCodec ac3_encoder;
-extern AVCodec amr_nb_encoder;
-extern AVCodec amr_wb_encoder;
 extern AVCodec asv1_encoder;
 extern AVCodec asv2_encoder;
 extern AVCodec bmp_encoder;
 extern AVCodec dvvideo_encoder;
-extern AVCodec faac_encoder;
 extern AVCodec ffv1_encoder;
 extern AVCodec ffvhuff_encoder;
 extern AVCodec flac_encoder;
@@ -2208,21 +2205,16 @@ extern AVCodec h263p_encoder;
 extern AVCodec h264_encoder;
 extern AVCodec huffyuv_encoder;
 extern AVCodec jpegls_encoder;
-extern AVCodec libgsm_encoder;
-extern AVCodec libgsm_ms_encoder;
-extern AVCodec libtheora_encoder;
 extern AVCodec ljpeg_encoder;
 extern AVCodec mdec_encoder;
 extern AVCodec mjpeg_encoder;
 extern AVCodec mp2_encoder;
-extern AVCodec mp3lame_encoder;
 extern AVCodec mpeg1video_encoder;
 extern AVCodec mpeg2video_encoder;
 extern AVCodec mpeg4_encoder;
 extern AVCodec msmpeg4v1_encoder;
 extern AVCodec msmpeg4v2_encoder;
 extern AVCodec msmpeg4v3_encoder;
-extern AVCodec oggvorbis_encoder;
 extern AVCodec pam_encoder;
 extern AVCodec pbm_encoder;
 extern AVCodec pgm_encoder;
@@ -2244,16 +2236,10 @@ extern AVCodec wmav1_encoder;
 extern AVCodec wmav2_encoder;
 extern AVCodec wmv1_encoder;
 extern AVCodec wmv2_encoder;
-extern AVCodec x264_encoder;
-extern AVCodec xvid_encoder;
-extern AVCodec zlib_encoder;
 extern AVCodec zmbv_encoder;
 
-extern AVCodec aac_decoder;
 extern AVCodec aasc_decoder;
 extern AVCodec alac_decoder;
-extern AVCodec amr_nb_decoder;
-extern AVCodec amr_wb_decoder;
 extern AVCodec asv1_decoder;
 extern AVCodec asv2_decoder;
 extern AVCodec atrac3_decoder;
@@ -2295,8 +2281,6 @@ extern AVCodec indeo3_decoder;
 extern AVCodec interplay_dpcm_decoder;
 extern AVCodec interplay_video_decoder;
 extern AVCodec kmvc_decoder;
-extern AVCodec libgsm_decoder;
-extern AVCodec libgsm_ms_decoder;
 extern AVCodec loco_decoder;
 extern AVCodec mace3_decoder;
 extern AVCodec mace6_decoder;
@@ -2312,7 +2296,6 @@ extern AVCodec mpc7_decoder;
 extern AVCodec mpeg1video_decoder;
 extern AVCodec mpeg2video_decoder;
 extern AVCodec mpeg4_decoder;
-extern AVCodec mpeg4aac_decoder;
 extern AVCodec mpeg_xvmc_decoder;
 extern AVCodec mpegvideo_decoder;
 extern AVCodec msmpeg4v1_decoder;
@@ -2322,7 +2305,6 @@ extern AVCodec msrle_decoder;
 extern AVCodec msvideo1_decoder;
 extern AVCodec mszh_decoder;
 extern AVCodec nuv_decoder;
-extern AVCodec oggvorbis_decoder;
 extern AVCodec png_decoder;
 extern AVCodec ptx_decoder;
 extern AVCodec qdm2_decoder;
@@ -2382,7 +2364,6 @@ extern AVCodec ws_snd1_decoder;
 extern AVCodec xan_dpcm_decoder;
 extern AVCodec xan_wc3_decoder;
 extern AVCodec xl_decoder;
-extern AVCodec zlib_decoder;
 extern AVCodec zmbv_decoder;
 
 /* PCM codecs */
@@ -2436,9 +2417,28 @@ PCM_CODEC(CODEC_ID_ADPCM_YAMAHA,  adpcm_yamaha);
 extern AVCodec rawvideo_decoder;
 extern AVCodec rawvideo_encoder;
 
-/* the following codecs use external GPL libs */
+/* the following codecs use external libs */
+extern AVCodec aac_decoder;
+extern AVCodec amr_nb_decoder;
+extern AVCodec amr_nb_encoder;
+extern AVCodec amr_wb_decoder;
+extern AVCodec amr_wb_encoder;
 extern AVCodec dts_decoder;
+extern AVCodec faac_encoder;
 extern AVCodec liba52_decoder;
+extern AVCodec libgsm_decoder;
+extern AVCodec libgsm_encoder;
+extern AVCodec libgsm_ms_decoder;
+extern AVCodec libgsm_ms_encoder;
+extern AVCodec libtheora_encoder;
+extern AVCodec mp3lame_encoder;
+extern AVCodec mpeg4aac_decoder;
+extern AVCodec oggvorbis_decoder;
+extern AVCodec oggvorbis_encoder;
+extern AVCodec x264_encoder;
+extern AVCodec xvid_encoder;
+extern AVCodec zlib_decoder;
+extern AVCodec zlib_encoder;
 
 /* subtitles */
 extern AVCodec dvbsub_decoder;