[vlc-devel] commit: transcode: If no module is explicitely selected, print that we are potentially using any module. (Pierre d'Herbemont )

git version control git at videolan.org
Sat May 24 02:39:47 CEST 2008


vlc | branch: master | Pierre d'Herbemont <pdherbemont at videolan.org> | Sat May 24 02:41:03 2008 +0200| [54dc1499af57b6f265f73292146168b0b9a1d91e]

transcode: If no module is explicitely selected, print that we are potentially using any module.

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=54dc1499af57b6f265f73292146168b0b9a1d91e
---

 modules/stream_out/transcode.c |   20 ++++++++++++--------
 1 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/modules/stream_out/transcode.c b/modules/stream_out/transcode.c
index 19bdfc7..ccedc51 100644
--- a/modules/stream_out/transcode.c
+++ b/modules/stream_out/transcode.c
@@ -1401,8 +1401,9 @@ static int transcode_audio_new( sout_stream_t *p_stream,
         module_Need( id->p_encoder, "encoder", p_sys->psz_aenc, true );
     if( !id->p_encoder->p_module )
     {
-        msg_Err( p_stream, "cannot find audio encoder (%s/%4.4s)",
-                 p_sys->psz_aenc, (char *)&p_sys->i_acodec );
+        msg_Err( p_stream, "cannot find audio encoder (module:%s fourcc:%4.4s)",
+                 p_sys->psz_aenc ? p_sys->psz_aenc : "any",
+                 (char *)&p_sys->i_acodec );
         module_Unneed( id->p_decoder, id->p_decoder->p_module );
         id->p_decoder->p_module = NULL;
         return VLC_EGENERIC;
@@ -1496,8 +1497,9 @@ static int transcode_audio_new( sout_stream_t *p_stream,
             module_Need( id->p_encoder, "encoder", p_sys->psz_aenc, true );
         if( !id->p_encoder->p_module )
         {
-            msg_Err( p_stream, "cannot find audio encoder (%s/%4.4s)",
-                     p_sys->psz_aenc, (char *)&p_sys->i_acodec );
+            msg_Err( p_stream, "cannot find audio encoder (module:%s fourcc:%4.4s)",
+                     p_sys->psz_aenc ? p_sys->psz_aenc : "any",
+                     (char *)&p_sys->i_acodec );
             transcode_audio_close( id );
             return VLC_EGENERIC;
         }
@@ -1837,8 +1839,9 @@ static int transcode_video_new( sout_stream_t *p_stream, sout_stream_id_t *id )
         module_Need( id->p_encoder, "encoder", p_sys->psz_venc, true );
     if( !id->p_encoder->p_module )
     {
-        msg_Err( p_stream, "cannot find video encoder (%s/%4.4s)",
-                 p_sys->psz_venc, (char *)&p_sys->i_vcodec );
+        msg_Err( p_stream, "cannot find video encoder (module:%s fourcc:%4.4s)",
+                 p_sys->psz_venc ? p_sys->psz_venc : "any",
+                 (char *)&p_sys->i_vcodec );
         module_Unneed( id->p_decoder, id->p_decoder->p_module );
         id->p_decoder->p_module = 0;
         return VLC_EGENERIC;
@@ -2152,8 +2155,9 @@ static int transcode_video_encoder_open( sout_stream_t *p_stream,
         module_Need( id->p_encoder, "encoder", p_sys->psz_venc, true );
     if( !id->p_encoder->p_module )
     {
-        msg_Err( p_stream, "cannot find video encoder (%s/%4.4s)",
-                 p_sys->psz_venc, (char *)&p_sys->i_vcodec );
+        msg_Err( p_stream, "cannot find video encoder (module:%s fourcc:%4.4s)",
+                 p_sys->psz_venc ? p_sys->psz_venc : "any",
+                 (char *)&p_sys->i_vcodec );
         return VLC_EGENERIC;
     }
 




More information about the vlc-devel mailing list