[vlc-commits] Twolame: bump priority and accept mp2a fourcc

[Jean-Baptiste Kempf]

vlc/vlc-2.0 | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Fri Apr  6 02:49:44 2012 +0200| [5b94b7d510a323dcad62205831d0c7ca9e186849] | committer: Jean-Baptiste Kempf

Twolame: bump priority and accept mp2a fourcc

This restores compatibility with 1.1 command lines and docs

Close #6227
(cherry picked from commit e466c8278d9cd13d055df9375e30a0ab805cc2c3)

Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>

> http://git.videolan.org/gitweb.cgi/vlc/vlc-2.0.git/?a=commit;h=5b94b7d510a323dcad62205831d0c7ca9e186849
---

 modules/codec/twolame.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/modules/codec/twolame.c b/modules/codec/twolame.c
index 440e152..cd07276 100644
--- a/modules/codec/twolame.c
+++ b/modules/codec/twolame.c
@@ -73,7 +73,7 @@ static const char *const ppsz_stereo_descriptions[] =
 vlc_module_begin ()
     set_shortname( "Twolame")
     set_description( N_("Libtwolame audio encoder") )
-    set_capability( "encoder", 50 )
+    set_capability( "encoder", 120 )
     set_callbacks( OpenEncoder, CloseEncoder )
     set_category( CAT_INPUT )
     set_subcategory( SUBCAT_INPUT_ACODEC )
@@ -132,6 +132,7 @@ static int OpenEncoder( vlc_object_t *p_this )
 
     if( p_enc->fmt_out.i_codec != VLC_CODEC_MP2 &&
         p_enc->fmt_out.i_codec != VLC_CODEC_MPGA &&
+        p_enc->fmt_out.i_codec != VLC_FOURCC( 'm', 'p', '2', 'a' ) &&
         !p_enc->b_force )
     {
         return VLC_EGENERIC;