[Ffmpeg-devel] [PATCH] Which Vorbis encoder by default

[Oded Shimon]

Right now, the only way to get ffmpeg to use the library vorbis encoder is 
to manually disable the native one.
I'm thinking maybe the default vorbis encoder should be the library one, 
and the way to choose the native one would be with -acodec vorbis_native . 
You'd still need to use --enable-libogg --enable-vorbis to get the library 
one, just like before... But if you didn't, there would be no "vorbis" 
encoder at all, just "vorbis_native".

Should I apply?

- ods15
-------------- next part --------------
Index: allcodecs.c
===================================================================
--- allcodecs.c	(revision 6525)
+++ allcodecs.c	(working copy)
@@ -51,7 +51,7 @@
 #endif //CONFIG_MP3LAME_ENCODER
 #endif
 #ifdef CONFIG_LIBVORBIS
-#if (defined CONFIG_OGGVORBIS_ENCODER && !defined CONFIG_VORBIS_ENCODER)
+#ifdef CONFIG_OGGVORBIS_ENCODER
     register_avcodec(&oggvorbis_encoder);
 #endif //CONFIG_OGGVORBIS_ENCODER
 #if (defined CONFIG_OGGVORBIS_DECODER && !defined CONFIG_VORBIS_DECODER)
Index: avcodec.h
===================================================================
--- avcodec.h	(revision 6525)
+++ avcodec.h	(working copy)
@@ -203,6 +203,7 @@
     CODEC_ID_AC3,
     CODEC_ID_DTS,
     CODEC_ID_VORBIS,
+    CODEC_ID_VORBIS_NATIVE,
     CODEC_ID_DVAUDIO,
     CODEC_ID_WMAV1,
     CODEC_ID_WMAV2,
Index: vorbis_enc.c
===================================================================
--- vorbis_enc.c	(revision 6527)
+++ vorbis_enc.c	(working copy)
@@ -1074,9 +1074,9 @@
 }
 
 AVCodec vorbis_encoder = {
-    "vorbis",
+    "vorbis_native",
     CODEC_TYPE_AUDIO,
-    CODEC_ID_VORBIS,
+    CODEC_ID_VORBIS_NATIVE,
     sizeof(venc_context_t),
     vorbis_encode_init,
     vorbis_encode_frame,