summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--libavcodec/flacenc.c18
1 files changed, 7 insertions, 11 deletions
diff --git a/libavcodec/flacenc.c b/libavcodec/flacenc.c
index 9cd65e9ac0..1486c88449 100644
--- a/libavcodec/flacenc.c
+++ b/libavcodec/flacenc.c
@@ -1285,24 +1285,20 @@ static int flac_encode_frame(AVCodecContext *avctx, uint8_t *frame,
channel_decorrelation(s);
frame_bytes = encode_frame(s);
- if (buf_size < frame_bytes) {
- av_log(avctx, AV_LOG_ERROR, "output buffer too small\n");
- return 0;
- }
- out_bytes = write_frame(s, frame, buf_size);
/* fallback to verbatim mode if the compressed frame is larger than it
would be if encoded uncompressed. */
- if (out_bytes > s->max_framesize) {
+ if (frame_bytes > s->max_framesize) {
s->frame.verbatim_only = 1;
frame_bytes = encode_frame(s);
- if (buf_size < frame_bytes) {
- av_log(avctx, AV_LOG_ERROR, "output buffer too small\n");
- return 0;
- }
- out_bytes = write_frame(s, frame, buf_size);
}
+ if (buf_size < frame_bytes) {
+ av_log(avctx, AV_LOG_ERROR, "output buffer too small\n");
+ return 0;
+ }
+ out_bytes = write_frame(s, frame, buf_size);
+
s->frame_count++;
avctx->coded_frame->pts = s->sample_count;
s->sample_count += avctx->frame_size;