Request 1098 (accepted)

Overview

Request 1098 (accepted)

- update internal ffmpeg to version 1.2.8

Created by enzokiel over 10 years ago
In state accepted
Package maintainer: enzokiel

Submit avidemux3

Submit package home:enzokiel:...hes:Multimedia / avidemux3 to package Multimedia / avidemux3

avidemux3.changes Changed

avidemux3.spec Changed

ffmpeg-1.2.7.tar.bz2/Changelog -> ffmpeg-1.2.8.tar.bz2/Changelog Changed

ffmpeg-1.2.7.tar.bz2/RELEASE -> ffmpeg-1.2.8.tar.bz2/RELEASE Changed

ffmpeg-1.2.7.tar.bz2/VERSION -> ffmpeg-1.2.8.tar.bz2/VERSION Changed

ffmpeg-1.2.7.tar.bz2/doc/Doxyfile -> ffmpeg-1.2.8.tar.bz2/doc/Doxyfile Changed

ffmpeg-1.2.7.tar.bz2/libavcodec/cdgraphics.c -> ffmpeg-1.2.8.tar.bz2/libavcodec/cdgraphics.c Changed

ffmpeg-1.2.7.tar.bz2/libavcodec/dv.c -> ffmpeg-1.2.8.tar.bz2/libavcodec/dv.c Changed

ffmpeg-1.2.7.tar.bz2/libavcodec/dvdsub_parser.c -> ffmpeg-1.2.8.tar.bz2/libavcodec/dvdsub_parser.c Changed

ffmpeg-1.2.7.tar.bz2/libavcodec/iff.c -> ffmpeg-1.2.8.tar.bz2/libavcodec/iff.c Changed

ffmpeg-1.2.7.tar.bz2/libavcodec/proresenc_kostya.c -> ffmpeg-1.2.8.tar.bz2/libavcodec/proresenc_kostya.c Changed

@@ -456,6 +456,11 @@
                                       num_cblocks, plane_factor,
                                       qmat);
         total_size += sizes[i];
+        if (put_bits_left(pb) < 0) {
+            av_log(avctx, AV_LOG_ERROR, "Serious underevaluation of"
+                   "required buffer size");
+            return AVERROR_BUFFER_TOO_SMALL;
+        }
     }
     return total_size;
 }
@@ -754,9 +759,9 @@
     avctx->coded_frame->pict_type = AV_PICTURE_TYPE_I;
     avctx->coded_frame->key_frame = 1;
 
-    pkt_size = ctx->frame_size_upper_bound + FF_MIN_BUFFER_SIZE;
+    pkt_size = ctx->frame_size_upper_bound;
 
-    if ((ret = ff_alloc_packet2(avctx, pkt, pkt_size)) < 0)
+    if ((ret = ff_alloc_packet2(avctx, pkt, pkt_size + FF_MIN_BUFFER_SIZE)) < 0)
         return ret;
 
     orig_buf = pkt->data;
@@ -833,7 +838,9 @@
                 slice_hdr = buf;
                 buf += slice_hdr_size - 1;
                 init_put_bits(&pb, buf, (pkt_size - (buf - orig_buf)) * 8);
-                encode_slice(avctx, pic, &pb, sizes, x, y, q, mbs_per_slice);
+                ret = encode_slice(avctx, pic, &pb, sizes, x, y, q, mbs_per_slice);
+                if (ret < 0)
+                    return ret;
 
                 bytestream_put_byte(&slice_hdr, q);
                 slice_size = slice_hdr_size + sizes[ctx->num_planes - 1];

ffmpeg-1.2.7.tar.bz2/libavcodec/put_bits.h -> ffmpeg-1.2.8.tar.bz2/libavcodec/put_bits.h Changed

ffmpeg-1.2.7.tar.bz2/libavformat/tee.c -> ffmpeg-1.2.8.tar.bz2/libavformat/tee.c Changed

ffmpeg-1.2.7.tar.bz2/libavformat/utils.c -> ffmpeg-1.2.8.tar.bz2/libavformat/utils.c Changed

ffmpeg-1.2.7.tar.bz2/version.sh -> ffmpeg-1.2.8.tar.bz2/version.sh Changed

Build Results
RPM Lint

Refresh

Comments for request 1098 0

Request History

enzokiel created request over 10 years ago

- update internal ffmpeg to version 1.2.8

mrdocs accepted request over 10 years ago

ok checkin