[SCM] libav/experimental: Simplify verbatim mode fallback by checking the frame size before writing.

[siretart at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit 3d2cd42f8a19460d1fd44771646b4411c3148383
Author: Justin Ruggles <justin.ruggles at gmail.com>
Date:   Sat Jul 31 21:08:53 2010 +0000

    Simplify verbatim mode fallback by checking the frame size before writing.
    
    Originally committed as revision 24632 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavcodec/flacenc.c b/libavcodec/flacenc.c
index 9cd65e9..1486c88 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;

-- 
Libav/FFmpeg packaging