[vlc-devel] commit: Remove "out of memory" messages and small cleanup. ( Jean-Paul Saman )

[git version control]

vlc | branch: 0.8.6-bugfix | Jean-Paul Saman <jpsaman at videolan.org> | Mon Dec  8 17:25:56 2008 +0100| [d164707401c754ea3287e12cce93b11de6c5a162] | committer: Jean-Paul Saman 

Remove "out of memory" messages and small cleanup.

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

 src/input/demux.c |    1 -
 src/input/input.c |    6 ++----
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/src/input/demux.c b/src/input/demux.c
index c62be61..8253b7a 100644
--- a/src/input/demux.c
+++ b/src/input/demux.c
@@ -331,7 +331,6 @@ stream_t *__stream_DemuxNew( vlc_object_t *p_obj, char *psz_demux,
     /* decoder fifo */
     if( ( p_sys->p_fifo = block_FifoNew( s ) ) == NULL )
     {
-        msg_Err( s, "out of memory" );
         vlc_object_destroy( s );
         free( p_sys );
         return NULL;
diff --git a/src/input/input.c b/src/input/input.c
index 0a49920..18ebcda 100644
--- a/src/input/input.c
+++ b/src/input/input.c
@@ -114,10 +114,8 @@ static input_thread_t *Create( vlc_object_t *p_parent, input_item_t *p_item,
     /* Allocate descriptor */
     p_input = vlc_object_create( p_parent, VLC_OBJECT_INPUT );
     if( p_input == NULL )
-    {
-        msg_Err( p_parent, "out of memory" );
         return NULL;
-    }
+
     p_input->psz_header = psz_header ? strdup( psz_header ) : NULL;
 
     /* Init Common fields */
@@ -532,7 +530,7 @@ static void MainLoop( input_thread_t *p_input )
         vlc_value_t val;
 
         /* Do the read */
-        if( p_input->i_state != PAUSE_S  )
+        if( p_input->i_state != PAUSE_S )
         {
             if( p_input->i_stop <= 0 || p_input->i_time < p_input->i_stop )
                 i_ret=p_input->input.p_demux->pf_demux(p_input->input.p_demux);