libhb: add support for libav aac encoder (libhb only)

This generalizes the ac3 encoder to make it easy to add support
for any audio encoder that libav supports.  Since ffaac is not quite
ready, the cli and gui does not expose ffaac yet.


git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@4029 b64f7644-9d1e-0410-96f1-a4d463321fa5

1 files changed, 5 insertions, 2 deletions

diff --git a/libhb/hb.c b/libhb/hb.c
index a4761a867..1e3686cf2 100644
--- a/libhb/hb.c
+++ b/libhb/hb.c
@@ -262,6 +262,9 @@ void hb_ff_set_sample_fmt(AVCodecContext *context, AVCodec *codec)
                 break;
             }
         }
+        if ( *fmt == -1 )
+            context->sample_fmt = codec->sample_fmts[0];
+
     }
 }
 
@@ -415,7 +418,7 @@ hb_handle_t * hb_init( int verbose, int update_check )
 	hb_register( &hb_encca_aac );
 	hb_register( &hb_encca_haac );
 #endif
-	hb_register( &hb_encac3 );
+	hb_register( &hb_encavcodeca );
     
     return h;
 }
@@ -517,7 +520,7 @@ hb_handle_t * hb_init_dl( int verbose, int update_check )
 	hb_register( &hb_encca_aac );
 	hb_register( &hb_encca_haac );
 #endif
-	hb_register( &hb_encac3 );
+	hb_register( &hb_encavcodeca );
 
 	return h;
 }