Consistent naming and lib prefixes for x264, xvid and mp3lame within the code.

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

5 files changed, 12 insertions, 12 deletions

diff --git a/libavcodec/allcodecs.c b/libavcodec/allcodecs.c
index 5956f19f69..65a0fa4967 100644
--- a/libavcodec/allcodecs.c
+++ b/libavcodec/allcodecs.c
@@ -93,6 +93,8 @@ void avcodec_register_all(void)
     REGISTER_DECODER(INTERPLAY_VIDEO, interplay_video);
     REGISTER_ENCDEC (JPEGLS, jpegls);
     REGISTER_DECODER(KMVC, kmvc);
+    REGISTER_ENCODER(LIBX264, libx264);
+    REGISTER_ENCODER(LIBXVID, libxvid);
     REGISTER_ENCODER(LJPEG, ljpeg);
     REGISTER_DECODER(LOCO, loco);
     REGISTER_DECODER(MDEC, mdec);
@@ -156,10 +158,8 @@ void avcodec_register_all(void)
     REGISTER_ENCDEC (WMV2, wmv2);
     REGISTER_DECODER(WMV3, wmv3);
     REGISTER_DECODER(WNV1, wnv1);
-    REGISTER_ENCODER(X264, x264);
     REGISTER_DECODER(XAN_WC3, xan_wc3);
     REGISTER_DECODER(XL, xl);
-    REGISTER_ENCODER(XVID, xvid);
     REGISTER_ENCDEC (ZLIB, zlib);
     REGISTER_ENCDEC (ZMBV, zmbv);
 
@@ -180,6 +180,7 @@ void avcodec_register_all(void)
     REGISTER_DECODER(LIBFAAD, libfaad);
     REGISTER_ENCDEC (LIBGSM, libgsm);
     REGISTER_ENCDEC (LIBGSM_MS, libgsm_ms);
+    REGISTER_ENCODER(LIBMP3LAME, libmp3lame);
     REGISTER_ENCODER(LIBTHEORA, libtheora);
     if (!ENABLE_VORBIS_ENCODER)  REGISTER_ENCODER(LIBVORBIS, libvorbis);
     if (!ENABLE_VORBIS_DECODER)  REGISTER_DECODER(LIBVORBIS, libvorbis);
@@ -188,7 +189,6 @@ void avcodec_register_all(void)
     REGISTER_ENCDEC (MP2, mp2);
     REGISTER_DECODER(MP3, mp3);
     REGISTER_DECODER(MP3ADU, mp3adu);
-    REGISTER_ENCODER(MP3LAME, mp3lame);
     REGISTER_DECODER(MP3ON4, mp3on4);
     REGISTER_DECODER(MPC7, mpc7);
     REGISTER_DECODER(QDM2, qdm2);
diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h
index 53d4b3f5be..bd75293d27 100644
--- a/libavcodec/avcodec.h
+++ b/libavcodec/avcodec.h
@@ -2433,13 +2433,13 @@ extern AVCodec libgsm_decoder;
 extern AVCodec libgsm_encoder;
 extern AVCodec libgsm_ms_decoder;
 extern AVCodec libgsm_ms_encoder;
+extern AVCodec libmp3lame_encoder;
 extern AVCodec libtheora_encoder;
 extern AVCodec libvorbis_decoder;
 extern AVCodec libvorbis_encoder;
-extern AVCodec mp3lame_encoder;
+extern AVCodec libx264_encoder;
+extern AVCodec libxvid_encoder;
 extern AVCodec mpeg4aac_decoder;
-extern AVCodec x264_encoder;
-extern AVCodec xvid_encoder;
 extern AVCodec zlib_decoder;
 extern AVCodec zlib_encoder;
 
diff --git a/libavcodec/libmp3lame.c b/libavcodec/libmp3lame.c
index 9a5177af30..7515a4fe60 100644
--- a/libavcodec/libmp3lame.c
+++ b/libavcodec/libmp3lame.c
@@ -208,8 +208,8 @@ static int MP3lame_encode_close(AVCodecContext *avctx)
 }
 
 
-AVCodec mp3lame_encoder = {
-    "mp3",
+AVCodec libmp3lame_encoder = {
+    "libmp3lame",
     CODEC_TYPE_AUDIO,
     CODEC_ID_MP3,
     sizeof(Mp3AudioContext),
diff --git a/libavcodec/libx264.c b/libavcodec/libx264.c
index c9df820f5d..ebe74d7e3c 100644
--- a/libavcodec/libx264.c
+++ b/libavcodec/libx264.c
@@ -287,8 +287,8 @@ X264_init(AVCodecContext *avctx)
     return 0;
 }
 
-AVCodec x264_encoder = {
-    .name = "h264",
+AVCodec libx264_encoder = {
+    .name = "libx264",
     .type = CODEC_TYPE_VIDEO,
     .id = CODEC_ID_H264,
     .priv_data_size = sizeof(X264Context),
diff --git a/libavcodec/libxvidff.c b/libavcodec/libxvidff.c
index 506af910be..d29177bda0 100644
--- a/libavcodec/libxvidff.c
+++ b/libavcodec/libxvidff.c
@@ -755,8 +755,8 @@ int xvid_ff_2pass(void *ref, int cmd, void *p1, void *p2) {
 /**
  * XviD codec definition for libavcodec.
  */
-AVCodec xvid_encoder = {
-    "xvid",
+AVCodec libxvid_encoder = {
+    "libxvid",
     CODEC_TYPE_VIDEO,
     CODEC_ID_XVID,
     sizeof(xvid_context_t),