[vlc-commits] commit: Used the right object for messages in src/input/decoder.c ( Laurent Aimar )

[git at videolan.org]

vlc/vlc-1.1 | branch: master | Laurent Aimar <fenrir at videolan.org> | Mon Nov  1 16:38:16 2010 +0100| [b3342e24119c94d1d682721105c70faef51c57a5] | committer: Rémi Duraffort 

Used the right object for messages in src/input/decoder.c

aout/vout were sometimes used. It was inconsistent and in some cases
those objects could be undefined (NULL).
(cherry picked from commit 49062f184c68e4d2a22c8f318139dbf368d567b6)

Signed-off-by: Rémi Duraffort <ivoire at videolan.org>

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

 src/input/decoder.c |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/input/decoder.c b/src/input/decoder.c
index 031cfb5..1273761 100644
--- a/src/input/decoder.c
+++ b/src/input/decoder.c
@@ -1205,7 +1205,7 @@ static void DecoderPlayAudio( decoder_t *p_dec, aout_buffer_t *p_audio,
         else
         {
             if( b_dated )
-                msg_Warn( p_aout, "received buffer in the future" );
+                msg_Warn( p_dec, "received buffer in the future" );
             else
                 msg_Warn( p_dec, "non-dated audio buffer received" );
 
@@ -1337,7 +1337,7 @@ static void DecoderPlayVideo( decoder_t *p_dec, picture_t *p_picture,
 
     if( p_picture->date <= VLC_TS_INVALID )
     {
-        msg_Warn( p_vout, "non-dated video buffer received" );
+        msg_Warn( p_dec, "non-dated video buffer received" );
         *pi_lost_sum += 1;
         vout_DropPicture( p_vout, p_picture );
         return;
@@ -1427,9 +1427,9 @@ static void DecoderPlayVideo( decoder_t *p_dec, picture_t *p_picture,
         else
         {
             if( b_dated )
-                msg_Warn( p_vout, "early picture skipped" );
+                msg_Warn( p_dec, "early picture skipped" );
             else
-                msg_Warn( p_vout, "non-dated video buffer received" );
+                msg_Warn( p_dec, "non-dated video buffer received" );
 
             *pi_lost_sum += 1;
             vout_UnlinkPicture( p_vout, p_picture );