Request 1500 (accepted)

Overview

Request 1500 (accepted)

- update internal ffmpeg to version 1.2.11
- removed workaround for build on arm armv6l/armv6hl, the problem
is caused by additional RaspberryPi repository and should be
fixed there

Created by enzokiel almost 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.10.tar.bz2/RELEASE -> ffmpeg-1.2.11.tar.bz2/RELEASE Changed

ffmpeg-1.2.10.tar.bz2/VERSION -> ffmpeg-1.2.11.tar.bz2/VERSION Changed

ffmpeg-1.2.10.tar.bz2/doc/Doxyfile -> ffmpeg-1.2.11.tar.bz2/doc/Doxyfile Changed

ffmpeg-1.2.10.tar.bz2/libavcodec/flacdec.c -> ffmpeg-1.2.11.tar.bz2/libavcodec/flacdec.c Changed

ffmpeg-1.2.10.tar.bz2/libavcodec/h264.c -> ffmpeg-1.2.11.tar.bz2/libavcodec/h264.c Changed

@@ -1043,6 +1043,7 @@
         av_freep(&h->visualization_buffer[i]);
 
     if (free_rbsp) {
+        memset(h->delayed_pic, 0, sizeof(h->delayed_pic));
         for (i = 0; i < h->picture_count && !h->avctx->internal->is_copy; i++)
             free_picture(h, &h->DPB[i]);
         av_freep(&h->DPB);
@@ -2431,6 +2432,16 @@
     h->luma_log2_weight_denom = get_ue_golomb(&h->gb);
     if (h->sps.chroma_format_idc)
         h->chroma_log2_weight_denom = get_ue_golomb(&h->gb);
+
+    if (h->luma_log2_weight_denom > 7U) {
+        av_log(h->avctx, AV_LOG_ERROR, "luma_log2_weight_denom %d is out of range\n", h->luma_log2_weight_denom);
+        h->luma_log2_weight_denom = 0;
+    }
+    if (h->chroma_log2_weight_denom > 7U) {
+        av_log(h->avctx, AV_LOG_ERROR, "chroma_log2_weight_denom %d is out of range\n", h->chroma_log2_weight_denom);
+        h->chroma_log2_weight_denom = 0;
+    }
+
     luma_def   = 1 << h->luma_log2_weight_denom;
     chroma_def = 1 << h->chroma_log2_weight_denom;

ffmpeg-1.2.10.tar.bz2/libavcodec/h264.h -> ffmpeg-1.2.11.tar.bz2/libavcodec/h264.h Changed

ffmpeg-1.2.10.tar.bz2/libavcodec/indeo3.c -> ffmpeg-1.2.11.tar.bz2/libavcodec/indeo3.c Changed

@@ -95,7 +95,7 @@
 
     int16_t         width, height;
     uint32_t        frame_num;      ///< current frame number (zero-based)
-    uint32_t        data_size;      ///< size of the frame data in bytes
+    int             data_size;      ///< size of the frame data in bytes
     uint16_t        frame_flags;    ///< frame properties
     uint8_t         cb_offset;      ///< needed for selecting VQ tables
     uint8_t         buf_sel;        ///< active frame buffer: 0 - primary, 1 -secondary
@@ -897,7 +897,8 @@
 {
     const uint8_t   *buf_ptr = buf, *bs_hdr;
     uint32_t        frame_num, word2, check_sum, data_size;
-    uint32_t        y_offset, u_offset, v_offset, starts[3], ends[3];
+    int             y_offset, u_offset, v_offset;
+    uint32_t        starts[3], ends[3];
     uint16_t        height, width;
     int             i, j;
 
@@ -977,7 +978,8 @@
     ctx->y_data_size = ends[0] - starts[0];
     ctx->v_data_size = ends[1] - starts[1];
     ctx->u_data_size = ends[2] - starts[2];
-    if (FFMAX3(y_offset, v_offset, u_offset) >= ctx->data_size - 16 ||
+    if (FFMIN3(y_offset, v_offset, u_offset) < 0 ||
+        FFMAX3(y_offset, v_offset, u_offset) >= ctx->data_size - 16 ||
         FFMIN3(ctx->y_data_size, ctx->v_data_size, ctx->u_data_size) <= 0) {
         av_log(avctx, AV_LOG_ERROR, "One of the y/u/v offsets is invalid\n");
         return AVERROR_INVALIDDATA;

ffmpeg-1.2.10.tar.bz2/libavcodec/mjpegdec.c -> ffmpeg-1.2.11.tar.bz2/libavcodec/mjpegdec.c Changed

@@ -1437,6 +1437,8 @@
     }
 
     if (id == AV_RB32("LJIF")) {
+        int rgb = s->rgb;
+        int pegasus_rct = s->pegasus_rct;
         if (s->avctx->debug & FF_DEBUG_PICT_INFO)
             av_log(s->avctx, AV_LOG_INFO,
                    "Pegasus lossless jpeg header found\n");
@@ -1446,17 +1448,27 @@
         skip_bits(&s->gb, 16); /* unknown always 0? */
         switch (get_bits(&s->gb, 8)) {
         case 1:
-            s->rgb         = 1;
-            s->pegasus_rct = 0;
+            rgb         = 1;
+            pegasus_rct = 0;
             break;
         case 2:
-            s->rgb         = 1;
-            s->pegasus_rct = 1;
+            rgb         = 1;
+            pegasus_rct = 1;
             break;
         default:
             av_log(s->avctx, AV_LOG_ERROR, "unknown colorspace\n");
         }
+
         len -= 9;
+        if (s->got_picture)
+            if (rgb != s->rgb || pegasus_rct != s->pegasus_rct) {
+                av_log(s->avctx, AV_LOG_WARNING, "Mismatching LJIF tag\n");
+                goto out;
+            }
+
+        s->rgb = rgb;
+        s->pegasus_rct = pegasus_rct;
+
         goto out;
     }

ffmpeg-1.2.10.tar.bz2/libavcodec/motion_est.c -> ffmpeg-1.2.11.tar.bz2/libavcodec/motion_est.c Changed

ffmpeg-1.2.10.tar.bz2/libavcodec/options_table.h -> ffmpeg-1.2.11.tar.bz2/libavcodec/options_table.h Changed

@@ -102,8 +102,8 @@
 {"extradata_size", NULL, OFFSET(extradata_size), AV_OPT_TYPE_INT, {.i64 = DEFAULT }, INT_MIN, INT_MAX},
 {"time_base", NULL, OFFSET(time_base), AV_OPT_TYPE_RATIONAL, {.dbl = 0}, INT_MIN, INT_MAX},
 {"g", "set the group of picture (GOP) size", OFFSET(gop_size), AV_OPT_TYPE_INT, {.i64 = 12 }, INT_MIN, INT_MAX, V|E},
-{"ar", "set audio sampling rate (in Hz)", OFFSET(sample_rate), AV_OPT_TYPE_INT, {.i64 = DEFAULT }, INT_MIN, INT_MAX, A|D|E},
-{"ac", "set number of audio channels", OFFSET(channels), AV_OPT_TYPE_INT, {.i64 = DEFAULT }, INT_MIN, INT_MAX, A|D|E},
+{"ar", "set audio sampling rate (in Hz)", OFFSET(sample_rate), AV_OPT_TYPE_INT, {.i64 = DEFAULT }, 0, INT_MAX, A|D|E},
+{"ac", "set number of audio channels", OFFSET(channels), AV_OPT_TYPE_INT, {.i64 = DEFAULT }, 0, INT_MAX, A|D|E},
 {"cutoff", "set cutoff bandwidth", OFFSET(cutoff), AV_OPT_TYPE_INT, {.i64 = DEFAULT }, INT_MIN, INT_MAX, A|E},
 {"frame_size", NULL, OFFSET(frame_size), AV_OPT_TYPE_INT, {.i64 = DEFAULT }, INT_MIN, INT_MAX, A|E},
 {"frame_number", NULL, OFFSET(frame_number), AV_OPT_TYPE_INT, {.i64 = DEFAULT }, INT_MIN, INT_MAX},

ffmpeg-1.2.10.tar.bz2/libavcodec/pngdec.c -> ffmpeg-1.2.11.tar.bz2/libavcodec/pngdec.c Changed

ffmpeg-1.2.10.tar.bz2/libavcodec/utils.c -> ffmpeg-1.2.11.tar.bz2/libavcodec/utils.c Changed

ffmpeg-1.2.10.tar.bz2/libavcodec/utvideodec.c -> ffmpeg-1.2.11.tar.bz2/libavcodec/utvideodec.c Changed

@@ -212,6 +212,8 @@
         slice_height = ((((slice + 1) * height) / slices) & cmask) -
                        slice_start;
 
+        if (!slice_height)
+            continue;
         bsrc = src + slice_start * stride;
 
         // first line - left neighbour prediction
@@ -222,7 +224,7 @@
             A        = bsrc[i];
         }
         bsrc += stride;
-        if (slice_height == 1)
+        if (slice_height <= 1)
             continue;
         // second line - first element has top prediction, the rest uses median
         C        = bsrc[-stride];
@@ -267,6 +269,8 @@
         slice_height   = ((((slice + 1) * height) / slices) & cmask) -
                          slice_start;
         slice_height >>= 1;
+        if (!slice_height)
+            continue;
 
         bsrc = src + slice_start * stride;
 
@@ -282,7 +286,7 @@
             A                 = bsrc[stride + i];
         }
         bsrc += stride2;
-        if (slice_height == 1)
+        if (slice_height <= 1)
             continue;
         // second line - first element has top prediction, the rest uses median
         C        = bsrc[-stride2];

ffmpeg-1.2.10.tar.bz2/libavcodec/vmdav.c -> ffmpeg-1.2.11.tar.bz2/libavcodec/vmdav.c Changed

ffmpeg-1.2.10.tar.bz2/libavcodec/wmaprodec.c -> ffmpeg-1.2.11.tar.bz2/libavcodec/wmaprodec.c Changed

ffmpeg-1.2.10.tar.bz2/libavformat/aviobuf.c -> ffmpeg-1.2.11.tar.bz2/libavformat/aviobuf.c Changed

ffmpeg-1.2.10.tar.bz2/libavformat/hlsenc.c -> ffmpeg-1.2.11.tar.bz2/libavformat/hlsenc.c Changed

ffmpeg-1.2.10.tar.bz2/libavformat/isom.h -> ffmpeg-1.2.11.tar.bz2/libavformat/isom.h Changed

ffmpeg-1.2.10.tar.bz2/libavformat/matroskadec.c -> ffmpeg-1.2.11.tar.bz2/libavformat/matroskadec.c Changed

ffmpeg-1.2.10.tar.bz2/libavformat/mov.c -> ffmpeg-1.2.11.tar.bz2/libavformat/mov.c Changed

@@ -2788,6 +2788,12 @@
     MOVAtom a;
     int i;
 
+    if (c->atom_depth > 10) {
+        av_log(c->fc, AV_LOG_ERROR, "Atoms too deeply nested\n");
+        return AVERROR_INVALIDDATA;
+    }
+    c->atom_depth ++;
+
     if (atom.size < 0)
         atom.size = INT64_MAX;
     while (total_size + 8 <= atom.size && !url_feof(pb)) {
@@ -2804,6 +2810,7 @@
                 {
                     av_log(c->fc, AV_LOG_ERROR, "Broken file, trak/mdat not at top-level\n");
                     avio_skip(pb, -8);
+                    c->atom_depth --;
                     return 0;
                 }
             }
@@ -2840,13 +2847,16 @@
             int64_t start_pos = avio_tell(pb);
             int64_t left;
             int err = parse(c, pb, a);
-            if (err < 0)
+            if (err < 0) {
+                c->atom_depth --;
                 return err;
+            }
             if (c->found_moov && c->found_mdat &&
                 ((!pb->seekable || c->fc->flags & AVFMT_FLAG_IGNIDX) ||
                  start_pos + a.size == avio_size(pb))) {
                 if (!pb->seekable || c->fc->flags & AVFMT_FLAG_IGNIDX)
                     c->next_root_atom = start_pos + a.size;
+                c->atom_depth --;
                 return 0;
             }
             left = a.size - avio_tell(pb) + start_pos;
@@ -2864,6 +2874,7 @@
     if (total_size < atom.size && atom.size < 0x7ffff)
         avio_skip(pb, atom.size - total_size);
 
+    c->atom_depth --;
     return 0;
 }

ffmpeg-1.2.10.tar.bz2/libavformat/rmdec.c -> ffmpeg-1.2.11.tar.bz2/libavformat/rmdec.c Changed

ffmpeg-1.2.10.tar.bz2/libswresample/soxr_resample.c -> ffmpeg-1.2.11.tar.bz2/libswresample/soxr_resample.c Changed

ffmpeg-1.2.10.tar.bz2/libswscale/swscale_internal.h -> ffmpeg-1.2.11.tar.bz2/libswscale/swscale_internal.h Changed

ffmpeg-1.2.10.tar.bz2/libswscale/x86/rgb2rgb_template.c -> ffmpeg-1.2.11.tar.bz2/libswscale/x86/rgb2rgb_template.c Changed

Build Results
RPM Lint

Refresh

Comments for request 1500 0

Request History

enzokiel created request almost 10 years ago

- update internal ffmpeg to version 1.2.11
- removed workaround for build on arm armv6l/armv6hl, the problem
is caused by additional RaspberryPi repository and should be
fixed there

enzokiel accepted request almost 10 years ago

OK.