# HG changeset patch
# User diego
# Date 1181119901 0
# Node ID 1deb3e53da27b74f09e97c86645058f775d07603
# Parent  4323e587708d65b5d3284c601272bfbdba54829f
Consistent naming and lib prefixes for x264, xvid and mp3lame within the code.

diff -r 4323e587708d -r 1deb3e53da27 allcodecs.c
--- a/allcodecs.c	Wed Jun 06 08:41:45 2007 +0000
+++ b/allcodecs.c	Wed Jun 06 08:51:41 2007 +0000
@@ -93,6 +93,8 @@
     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 @@
     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 @@
     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 @@
     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 -r 4323e587708d -r 1deb3e53da27 avcodec.h
--- a/avcodec.h	Wed Jun 06 08:41:45 2007 +0000
+++ b/avcodec.h	Wed Jun 06 08:51:41 2007 +0000
@@ -2433,13 +2433,13 @@
 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 -r 4323e587708d -r 1deb3e53da27 libmp3lame.c
--- a/libmp3lame.c	Wed Jun 06 08:41:45 2007 +0000
+++ b/libmp3lame.c	Wed Jun 06 08:51:41 2007 +0000
@@ -208,8 +208,8 @@
 }
 
 
-AVCodec mp3lame_encoder = {
-    "mp3",
+AVCodec libmp3lame_encoder = {
+    "libmp3lame",
     CODEC_TYPE_AUDIO,
     CODEC_ID_MP3,
     sizeof(Mp3AudioContext),
diff -r 4323e587708d -r 1deb3e53da27 libx264.c
--- a/libx264.c	Wed Jun 06 08:41:45 2007 +0000
+++ b/libx264.c	Wed Jun 06 08:51:41 2007 +0000
@@ -287,8 +287,8 @@
     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 -r 4323e587708d -r 1deb3e53da27 libxvidff.c
--- a/libxvidff.c	Wed Jun 06 08:41:45 2007 +0000
+++ b/libxvidff.c	Wed Jun 06 08:51:41 2007 +0000
@@ -755,8 +755,8 @@
 /**
  * XviD codec definition for libavcodec.
  */
-AVCodec xvid_encoder = {
-    "xvid",
+AVCodec libxvid_encoder = {
+    "libxvid",
     CODEC_TYPE_VIDEO,
     CODEC_ID_XVID,
     sizeof(xvid_context_t),