summaryrefslogtreecommitdiff
path: root/avconv.c
diff options
context:
space:
mode:
authorAnton Khirnov <anton@khirnov.net>2012-05-07 13:55:03 +0200
committerAnton Khirnov <anton@khirnov.net>2012-05-09 17:46:54 +0200
commita5117a2444f3e636ff824ea467bc828d482c68fc (patch)
tree5987200061f5c74ce5b35af47cbcf81a88f8583f /avconv.c
parent6d7f61770094cc80ca2d93c4784c0091411d8242 (diff)
lavc: pad last audio frame with silence when needed.
Diffstat (limited to 'avconv.c')
-rw-r--r--avconv.c8
1 files changed, 0 insertions, 8 deletions
diff --git a/avconv.c b/avconv.c
index 33758c12b7..1aed70413b 100644
--- a/avconv.c
+++ b/avconv.c
@@ -2048,14 +2048,6 @@ static void flush_encoders(void)
av_fifo_generic_read(ost->fifo, audio_buf, fifo_bytes, NULL);
- /* pad last frame with silence if needed */
- if (!(enc->codec->capabilities & CODEC_CAP_SMALL_LAST_FRAME)) {
- frame_bytes = enc->frame_size * enc->channels *
- av_get_bytes_per_sample(enc->sample_fmt);
- if (allocated_audio_buf_size < frame_bytes)
- exit_program(1);
- generate_silence(audio_buf+fifo_bytes, enc->sample_fmt, frame_bytes - fifo_bytes);
- }
encode_audio_frame(os, ost, audio_buf, frame_bytes);
} else {
/* flush encoder with NULL frames until it is done