@@ -96,8 +96,8 @@ show_help(){

   echo "  --enable-libtheora       enable Theora encoding via libtheora [default=no]"

   echo "  --enable-libvorbis       enable Vorbis en/decoding via libvorbis,"

   echo "                           native implementations exist [default=no]"

-  echo "  --enable-x264            enable H.264 encoding via x264 [default=no]"

-  echo "  --enable-xvid            enable Xvid encoding via xvidcore,"

+  echo "  --enable-libx264         enable H.264 encoding via x264 [default=no]"

+  echo "  --enable-libxvid         enable Xvid encoding via xvidcore,"

   echo "                           native MPEG-4/Xvid encoder exists [default=no]"

   echo ""

   echo "Advanced options (experts only):"

@@ -595,6 +595,8 @@ CONFIG_LIST='

     libogg

     libtheora

     libvorbis

+    libx264

+    libxvid

     memalign_hack

     mpegaudio_hp

     network

@@ -606,8 +608,6 @@ CONFIG_LIST='

     v4l

     v4l2

     x11grab

-    x264

-    xvid

     zlib

 '

@@ -703,8 +703,6 @@ vc1_decoder_deps="h263_decoder"

 wmv1_decoder_deps="h263_decoder"

 wmv2_decoder_deps="h263_decoder"

 wmv3_decoder_deps="h263_decoder"

-x264_encoder_deps="x264"

-xvid_encoder_deps="xvid"

 zmbv_decoder_deps="zlib"

 zmbv_encoder_deps="zlib"

@@ -721,10 +719,12 @@ libgsm_decoder_deps="libgsm"

 libgsm_encoder_deps="libgsm"

 libgsm_ms_decoder_deps="libgsm"

 libgsm_ms_encoder_deps="libgsm"

+libmp3lame_encoder_deps="libmp3lame"

 libtheora_encoder_deps="libtheora"

-mp3lame_encoder_deps="libmp3lame"

 libvorbis_decoder_deps="libvorbis"

 libvorbis_encoder_deps="libvorbis"

+libx264_encoder_deps="libx264"

+libxvid_encoder_deps="libxvid"

 # demuxers / muxers

 ac3_demuxer_deps="ac3_parser"

@@ -843,10 +843,10 @@ libnut="no"

 libogg="no"

 libtheora="no"

 libvorbis="no"

+libx264="no"

+libxvid="no"

 mlib="no"

 x11grab="no"

-x264="no"

-xvid="no"

 zlib="yes"

 # configurable options

@@ -1286,8 +1286,8 @@ if disabled gpl ; then

     }

     die_gpl_disabled "The Postprocessing code" pp

     die_gpl_disabled "liba52"                  liba52

-    die_gpl_disabled "libxvidcore"             xvid

-    die_gpl_disabled "x264"                    x264

+    die_gpl_disabled "libx264"                 libx264

+    die_gpl_disabled "libxvidcore"             libxvid

     die_gpl_disabled "FAAD2"                   libfaad2

     die_gpl_disabled "The X11 grabber"         x11grab

     die_gpl_disabled "The software scaler"     swscaler

@@ -1635,8 +1635,8 @@ enabled libtheora  && require libtheora theora/theora.h theora_info_init -ltheor

 enabled libvorbis  && require libvorbis vorbis/vorbisenc.h vorbis_info_init -lvorbis -lvorbisenc -logg

 enabled libogg     && require libogg ogg/ogg.h ogg_sync_init -logg

 enabled libnut     && require libnut libnut.h nut_demuxer_init -lnut

-enabled xvid       && require XviD xvid.h xvid_global -lxvidcore

-enabled x264       && require x264 x264.h x264_encoder_open -lx264

+enabled libx264    && require x264 x264.h x264_encoder_open -lx264

+enabled libxvid    && require Xvid xvid.h xvid_global -lxvidcore

 enabled dc1394     && require libdc1394 libdc1394/dc1394_control.h dc1394_create_handle -ldc1394_control -lraw1394

 enabled mlib       && require mediaLib mlib_types.h mlib_VectorSub_S16_U8_Mod -lmlib

 enabled libfaac    && require2 libfaac "stdint.h faac.h" faacEncGetVersion -lfaac

@@ -1899,8 +1899,8 @@ echo "libnut enabled            $libnut"

 echo "libogg enabled            $libogg"

 echo "libtheora enabled         $libtheora"

 echo "libvorbis enabled         $libvorbis"

-echo "x264 enabled              $x264"

-echo "XviD enabled              $xvid"

+echo "x264 enabled              $libx264"

+echo "XviD enabled              $libxvid"

 echo "zlib enabled              $zlib"

 if disabled gpl; then

     echo "License: LGPL"

@@ -135,7 +135,7 @@ output an AVI file with MPEG-4 video and MP3 audio. Note that in this

 command we use B-frames so the MPEG-4 stream is DivX5 compatible, and

 GOP size is 300 which means one intra frame every 10 seconds for 29.97fps

 input video. Furthermore, the audio stream is MP3-encoded so you need

-to enable LAME support by passing @code{--enable-mp3lame} to configure.

+to enable LAME support by passing @code{--enable-libmp3lame} to configure.

 The mapping is particularly useful for DVD transcoding

 to get the desired audio language.

@@ -49,8 +49,8 @@ I understand that FreeBSD systems work just fine as well.

 @section How do I make it work?

 First, build the kit. It *really* helps to have installed LAME first. Then when

-you run the ffserver ./configure, make sure that you have the --enable-mp3lame

-flag turned on.

+you run the ffserver ./configure, make sure that you have the

+@code{--enable-libmp3lame} flag turned on.

 LAME is important as it allows for streaming audio to Windows Media Player.

 Don't ask why the other audio types do not work.

@@ -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);

@@ -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;

@@ -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),

@@ -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),

@@ -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),