From f29cdfec961d41bd4905a2983a74e7c814cfb851 Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Mon, 19 May 2014 16:56:55 +0200 Subject: avcodec/libvorbisenc: do not attempt to flush if no data was input this prevents the creation of a packet even though no single sample has ever been input, which some confusion in the timestamp generation Signed-off-by: Michael Niedermayer --- libavcodec/libvorbisenc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'libavcodec/libvorbisenc.c') diff --git a/libavcodec/libvorbisenc.c b/libavcodec/libvorbisenc.c index c655c21bd6..32465db906 100644 --- a/libavcodec/libvorbisenc.c +++ b/libavcodec/libvorbisenc.c @@ -295,7 +295,7 @@ static int libvorbis_encode_frame(AVCodecContext *avctx, AVPacket *avpkt, if ((ret = ff_af_queue_add(&s->afq, frame)) < 0) return ret; } else { - if (!s->eof) + if (!s->eof && s->afq.frame_alloc) if ((ret = vorbis_analysis_wrote(&s->vd, 0)) < 0) { av_log(avctx, AV_LOG_ERROR, "error in vorbis_analysis_wrote()\n"); return vorbis_error_to_averror(ret); -- cgit v1.2.3