[vlc-devel] commit: Remove abusive error message ( Rémi Denis-Courmont )

git version control git at videolan.org
Sat Jun 28 14:34:40 CEST 2008


vlc | branch: master | Rémi Denis-Courmont <rdenis at simphalempin.com> | Sat Jun 28 15:36:38 2008 +0300| [cb02b264b58150bf45d0f68019ac32c02d2b5f1e]

Remove abusive error message

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

 src/audio_output/dec.c |   11 +++++------
 1 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/src/audio_output/dec.c b/src/audio_output/dec.c
index 18d9fab..60dde42 100644
--- a/src/audio_output/dec.c
+++ b/src/audio_output/dec.c
@@ -307,17 +307,16 @@ int aout_DecPlay( aout_instance_t * p_aout, aout_input_t * p_input,
         return -1;
     }
 
+#ifndef FIXME
+    /* This hack for #transcode{acodec=...}:display to work -- Courmisch */
+    if( i_input_rate == 0 )
+        i_input_rate = INPUT_RATE_DEFAULT;
+#endif
     if( i_input_rate > INPUT_RATE_DEFAULT * AOUT_MAX_INPUT_RATE ||
         i_input_rate < INPUT_RATE_DEFAULT / AOUT_MAX_INPUT_RATE )
     {
-#ifndef FIXME
-        msg_Err( p_aout, "FIXME invalid input rate (%u/%u)", i_input_rate,
-                 INPUT_RATE_DEFAULT );
-        i_input_rate = INPUT_RATE_DEFAULT;
-#else
         aout_BufferFree( p_buffer );
         return 0;
-#endif
     }
 
     /* Apply the desynchronisation requested by the user */




More information about the vlc-devel mailing list