[FFmpeg-cvslog] Merge commit '796dca027be09334d7bbf4f2ac1200e06bb054cb'

[Clément Bœsch]

ffmpeg | branch: master | Clément Bœsch <u at pkh.me> | Sun Mar 19 17:36:17 2017 +0100| [f09aa73b305073e193af88cf12b52b8f4b609529] | committer: Clément Bœsch

Merge commit '796dca027be09334d7bbf4f2ac1200e06bb054cb'

* commit '796dca027be09334d7bbf4f2ac1200e06bb054cb':
  alac: do not return success if nothing was decoded

See e11983bda073f8c63f60509ee753da9fba20ed10

Merged-by: Clément Bœsch <u at pkh.me>

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

 libavcodec/alac.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libavcodec/alac.c b/libavcodec/alac.c
index 8d234ed..ae1204b 100644
--- a/libavcodec/alac.c
+++ b/libavcodec/alac.c
@@ -460,7 +460,7 @@ static int alac_decode_frame(AVCodecContext *avctx, void *data,
                avpkt->size * 8 - get_bits_count(&alac->gb));
     }
 
-    if (alac->channels == ch)
+    if (alac->channels == ch && alac->nb_samples)
         *got_frame_ptr = 1;
     else
         av_log(avctx, AV_LOG_WARNING, "Failed to decode all channels\n");


======================================================================

diff --cc libavcodec/alac.c
index 8d234ed,0d2a7ca..ae1204b
--- a/libavcodec/alac.c
+++ b/libavcodec/alac.c
@@@ -460,10 -457,7 +460,10 @@@ static int alac_decode_frame(AVCodecCon
                 avpkt->size * 8 - get_bits_count(&alac->gb));
      }
  
-     if (alac->channels == ch)
 -    *got_frame_ptr = 1;
++    if (alac->channels == ch && alac->nb_samples)
 +        *got_frame_ptr = 1;
 +    else
 +        av_log(avctx, AV_LOG_WARNING, "Failed to decode all channels\n");
  
      return avpkt->size;
  }