[vlc-commits] libmpgatofixed32: give mad-errors as msg_Err and give empty frames only if mad tells that it can 't recover from that error

[Ilkka Ollakka]

vlc/vlc-2.1 | branch: master | Ilkka Ollakka <ileoo at videolan.org> | Wed Mar 20 11:28:49 2013 +0200| [b7d7829686348c73890d78a5f6cee0cbaf8f49e2] | committer: Jean-Baptiste Kempf

libmpgatofixed32: give mad-errors as msg_Err and give empty frames only if mad tells that it can't recover from that error

(cherry picked from commit c74824b373ac16e02a5c3340585e133caf08b577)
Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>

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

 modules/audio_filter/converter/mpgatofixed32.c |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/modules/audio_filter/converter/mpgatofixed32.c b/modules/audio_filter/converter/mpgatofixed32.c
index 70a4a6a..781af87 100644
--- a/modules/audio_filter/converter/mpgatofixed32.c
+++ b/modules/audio_filter/converter/mpgatofixed32.c
@@ -95,9 +95,10 @@ static void DoWork( filter_t * p_filter,
                        p_in_buf->i_buffer );
     if ( mad_frame_decode( &p_sys->mad_frame, &p_sys->mad_stream ) == -1 )
     {
-        msg_Dbg( p_filter, "libmad error: %s",
+        msg_Err( p_filter, "libmad error: %s",
                   mad_stream_errorstr( &p_sys->mad_stream ) );
-        p_sys->i_reject_count = 3;
+        if( !MAD_RECOVERABLE( p_sys->mad_stream.error ) )
+            p_sys->i_reject_count = 3;
     }
     else if( p_in_buf->i_flags & BLOCK_FLAG_DISCONTINUITY )
     {