Commit b3342e24 authored by Laurent Aimar's avatar Laurent Aimar Committed by 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: default avatarRémi Duraffort <ivoire@videolan.org>
parent 69cb599b
...@@ -1205,7 +1205,7 @@ static void DecoderPlayAudio( decoder_t *p_dec, aout_buffer_t *p_audio, ...@@ -1205,7 +1205,7 @@ static void DecoderPlayAudio( decoder_t *p_dec, aout_buffer_t *p_audio,
else else
{ {
if( b_dated ) if( b_dated )
msg_Warn( p_aout, "received buffer in the future" ); msg_Warn( p_dec, "received buffer in the future" );
else else
msg_Warn( p_dec, "non-dated audio buffer received" ); msg_Warn( p_dec, "non-dated audio buffer received" );
...@@ -1337,7 +1337,7 @@ static void DecoderPlayVideo( decoder_t *p_dec, picture_t *p_picture, ...@@ -1337,7 +1337,7 @@ static void DecoderPlayVideo( decoder_t *p_dec, picture_t *p_picture,
if( p_picture->date <= VLC_TS_INVALID ) 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; *pi_lost_sum += 1;
vout_DropPicture( p_vout, p_picture ); vout_DropPicture( p_vout, p_picture );
return; return;
...@@ -1427,9 +1427,9 @@ static void DecoderPlayVideo( decoder_t *p_dec, picture_t *p_picture, ...@@ -1427,9 +1427,9 @@ static void DecoderPlayVideo( decoder_t *p_dec, picture_t *p_picture,
else else
{ {
if( b_dated ) if( b_dated )
msg_Warn( p_vout, "early picture skipped" ); msg_Warn( p_dec, "early picture skipped" );
else else
msg_Warn( p_vout, "non-dated video buffer received" ); msg_Warn( p_dec, "non-dated video buffer received" );
*pi_lost_sum += 1; *pi_lost_sum += 1;
vout_UnlinkPicture( p_vout, p_picture ); vout_UnlinkPicture( p_vout, p_picture );
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment