[vlc-commits] avcodec/audio: set decoder error only when it's critical

Thomas Guillem git at videolan.org
Tue Nov 8 16:47:58 CET 2016


vlc | branch: master | Thomas Guillem <thomas at gllm.fr> | Tue Nov  8 16:14:51 2016 +0100| [611fc2e2049b240da354f5e58f7476713c9d5157] | committer: Thomas Guillem

avcodec/audio: set decoder error only when it's critical

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

 modules/codec/avcodec/audio.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/modules/codec/avcodec/audio.c b/modules/codec/avcodec/audio.c
index 3c9d71a..c1527b0 100644
--- a/modules/codec/avcodec/audio.c
+++ b/modules/codec/avcodec/audio.c
@@ -401,7 +401,10 @@ static block_t *DecodeAudio( decoder_t *p_dec, block_t **pp_block )
             }
             else if ( ret != AVERROR(EAGAIN) ) /* Errors other than buffer full */
             {
-                goto end;
+                if( ret == AVERROR(ENOMEM) || ret == AVERROR(EINVAL) )
+                    goto end;
+                else
+                    goto drop;
             }
         }
 



More information about the vlc-commits mailing list