[FFmpeg-cvslog] lavc: signal no output when a NULL frame is passed to audio encoder without delay

[Anton Khirnov]

ffmpeg | branch: master | Anton Khirnov <anton at khirnov.net> | Fri Feb 24 13:02:05 2012 +0100| [52953d61ca6b4fb6dd5b8892099e9fb9f795490c] | committer: Anton Khirnov

lavc: signal no output when a NULL frame is passed to audio encoder without delay

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

 libavcodec/utils.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/libavcodec/utils.c b/libavcodec/utils.c
index 285be9b..4d07c9c 100644
--- a/libavcodec/utils.c
+++ b/libavcodec/utils.c
@@ -862,6 +862,8 @@ int attribute_align_arg avcodec_encode_audio2(AVCodecContext *avctx,
     int user_packet = !!avpkt->data;
     int nb_samples;
 
+    *got_packet_ptr = 0;
+
     if (!(avctx->codec->capabilities & CODEC_CAP_DELAY) && !frame) {
         av_init_packet(avpkt);
         avpkt->size = 0;
@@ -883,7 +885,6 @@ int attribute_align_arg avcodec_encode_audio2(AVCodecContext *avctx,
     }
 
     if (avctx->codec->encode2) {
-        *got_packet_ptr = 0;
         ret = avctx->codec->encode2(avctx, avpkt, frame, got_packet_ptr);
         if (!ret && *got_packet_ptr) {
             if (!(avctx->codec->capabilities & CODEC_CAP_DELAY)) {