Request 1236 (accepted)

Overview

Request 1236 (accepted)

- update internal ffmpeg to version 1.2.9

Created by enzokiel about 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.8.tar.bz2/RELEASE -> ffmpeg-1.2.9.tar.bz2/RELEASE Changed

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

ffmpeg-1.2.8.tar.bz2/configure -> ffmpeg-1.2.9.tar.bz2/configure Changed

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

ffmpeg-1.2.8.tar.bz2/libavcodec/aac_parser.c -> ffmpeg-1.2.9.tar.bz2/libavcodec/aac_parser.c Changed

ffmpeg-1.2.8.tar.bz2/libavcodec/ac3_parser.c -> ffmpeg-1.2.9.tar.bz2/libavcodec/ac3_parser.c Changed

ffmpeg-1.2.8.tar.bz2/libavcodec/ac3enc_template.c -> ffmpeg-1.2.9.tar.bz2/libavcodec/ac3enc_template.c Changed

ffmpeg-1.2.8.tar.bz2/libavcodec/cinepak.c -> ffmpeg-1.2.9.tar.bz2/libavcodec/cinepak.c Changed

ffmpeg-1.2.8.tar.bz2/libavcodec/gifdec.c -> ffmpeg-1.2.9.tar.bz2/libavcodec/gifdec.c Changed

ffmpeg-1.2.8.tar.bz2/libavcodec/h264.c -> ffmpeg-1.2.9.tar.bz2/libavcodec/h264.c Changed

ffmpeg-1.2.8.tar.bz2/libavcodec/jpeglsdec.c -> ffmpeg-1.2.9.tar.bz2/libavcodec/jpeglsdec.c Changed

ffmpeg-1.2.8.tar.bz2/libavcodec/libilbc.c -> ffmpeg-1.2.9.tar.bz2/libavcodec/libilbc.c Changed

ffmpeg-1.2.8.tar.bz2/libavcodec/mjpegdec.c -> ffmpeg-1.2.9.tar.bz2/libavcodec/mjpegdec.c Changed

@@ -211,7 +211,7 @@
 
 int ff_mjpeg_decode_sof(MJpegDecodeContext *s)
 {
-    int len, nb_components, i, width, height, pix_fmt_id;
+    int len, nb_components, i, width, height, bits, pix_fmt_id;
     int h_count[MAX_COMPONENTS];
     int v_count[MAX_COMPONENTS];
 
@@ -220,14 +220,14 @@
 
     /* XXX: verify len field validity */
     len     = get_bits(&s->gb, 16);
-    s->bits = get_bits(&s->gb, 8);
+    bits = get_bits(&s->gb, 8);
 
     if (s->pegasus_rct)
-        s->bits = 9;
-    if (s->bits == 9 && !s->pegasus_rct)
+        bits = 9;
+    if (bits == 9 && !s->pegasus_rct)
         s->rct  = 1;    // FIXME ugly
 
-    if (s->bits != 8 && !s->lossless) {
+    if (bits != 8 && !s->lossless) {
         av_log(s->avctx, AV_LOG_ERROR, "only 8 bits/component accepted\n");
         return -1;
     }
@@ -258,7 +258,7 @@
             return AVERROR_INVALIDDATA;
         }
     }
-    if (s->ls && !(s->bits <= 8 || nb_components == 1)) {
+    if (s->ls && !(bits <= 8 || nb_components == 1)) {
         av_log_missing_feature(s->avctx,
                                "For JPEG-LS anything except <= 8 bits/component"
                                " or 16-bit gray", 0);
@@ -301,12 +301,14 @@
 
     /* if different size, realloc/alloc picture */
     if (   width != s->width || height != s->height
+        || bits != s->bits
         || memcmp(s->h_count, h_count, sizeof(h_count))
         || memcmp(s->v_count, v_count, sizeof(v_count))) {
         av_freep(&s->qscale_table);
 
         s->width      = width;
         s->height     = height;
+        s->bits       = bits;
         memcpy(s->h_count, h_count, sizeof(h_count));
         memcpy(s->v_count, v_count, sizeof(v_count));
         s->interlaced = 0;

ffmpeg-1.2.8.tar.bz2/libavcodec/mmvideo.c -> ffmpeg-1.2.9.tar.bz2/libavcodec/mmvideo.c Changed

ffmpeg-1.2.8.tar.bz2/libavcodec/mpegvideo.c -> ffmpeg-1.2.9.tar.bz2/libavcodec/mpegvideo.c Changed

@@ -1086,6 +1086,9 @@
 {
     int i, err = 0;
 
+    if (!s->context_initialized)
+        return AVERROR(EINVAL);
+
     if (s->slice_context_count > 1) {
         for (i = 0; i < s->slice_context_count; i++) {
             free_duplicate_context(s->thread_context[i]);
@@ -1114,8 +1117,8 @@
         s->mb_height = (s->height + 15) / 16;
 
     if ((s->width || s->height) &&
-        av_image_check_size(s->width, s->height, 0, s->avctx))
-        return AVERROR_INVALIDDATA;
+        (err = av_image_check_size(s->width, s->height, 0, s->avctx)) < 0)
+        goto fail;
 
     if ((err = init_context_frame(s)))
         goto fail;
@@ -1131,7 +1134,7 @@
             }
 
             for (i = 0; i < nb_slices; i++) {
-                if (init_duplicate_context(s->thread_context[i]) < 0)
+                if ((err = init_duplicate_context(s->thread_context[i])) < 0)
                     goto fail;
                     s->thread_context[i]->start_mb_y =
                         (s->mb_height * (i) + nb_slices / 2) / nb_slices;

ffmpeg-1.2.8.tar.bz2/libavcodec/pngdec.c -> ffmpeg-1.2.9.tar.bz2/libavcodec/pngdec.c Changed

@@ -631,7 +631,7 @@
                 } else if ((s->bits_per_pixel == 1 || s->bits_per_pixel == 2 || s->bits_per_pixel == 4 || s->bits_per_pixel == 8) &&
                            s->color_type == PNG_COLOR_TYPE_PALETTE) {
                     avctx->pix_fmt = AV_PIX_FMT_PAL8;
-                } else if (s->bit_depth == 1) {
+                } else if (s->bit_depth == 1 && s->bits_per_pixel == 1) {
                     avctx->pix_fmt = AV_PIX_FMT_MONOBLACK;
                 } else if (s->bit_depth == 8 &&
                            s->color_type == PNG_COLOR_TYPE_GRAY_ALPHA) {
@@ -842,9 +842,10 @@
             int i, j;
             uint8_t *pd      = s->current_picture->data[0];
             uint8_t *pd_last = s->last_picture->data[0];
+            int ls = FFMIN(av_image_get_linesize(s->current_picture->format, s->width, 0), s->width * s->bpp);
 
             for (j = 0; j < s->height; j++) {
-                for (i = 0; i < s->width * s->bpp; i++) {
+                for (i = 0; i < ls; i++) {
                     pd[i] += pd_last[i];
                 }
                 pd      += s->image_linesize;

ffmpeg-1.2.8.tar.bz2/libavcodec/qpeg.c -> ffmpeg-1.2.9.tar.bz2/libavcodec/qpeg.c Changed

ffmpeg-1.2.8.tar.bz2/libavcodec/ra144enc.c -> ffmpeg-1.2.9.tar.bz2/libavcodec/ra144enc.c Changed

ffmpeg-1.2.8.tar.bz2/libavcodec/smc.c -> ffmpeg-1.2.9.tar.bz2/libavcodec/smc.c Changed

ffmpeg-1.2.8.tar.bz2/libavcodec/snow.h -> ffmpeg-1.2.9.tar.bz2/libavcodec/snow.h Changed

ffmpeg-1.2.8.tar.bz2/libavcodec/tiff.c -> ffmpeg-1.2.9.tar.bz2/libavcodec/tiff.c Changed

ffmpeg-1.2.8.tar.bz2/libavcodec/utils.c -> ffmpeg-1.2.9.tar.bz2/libavcodec/utils.c Changed

ffmpeg-1.2.8.tar.bz2/libavcodec/x86/dsputil.asm -> ffmpeg-1.2.9.tar.bz2/libavcodec/x86/dsputil.asm Changed

ffmpeg-1.2.8.tar.bz2/libavdevice/bktr.c -> ffmpeg-1.2.9.tar.bz2/libavdevice/bktr.c Changed

ffmpeg-1.2.8.tar.bz2/libavformat/apetag.c -> ffmpeg-1.2.9.tar.bz2/libavformat/apetag.c Changed

ffmpeg-1.2.8.tar.bz2/libavformat/m4vdec.c -> ffmpeg-1.2.9.tar.bz2/libavformat/m4vdec.c Changed

ffmpeg-1.2.8.tar.bz2/libavformat/mpegts.c -> ffmpeg-1.2.9.tar.bz2/libavformat/mpegts.c Changed

ffmpeg-1.2.8.tar.bz2/libavformat/swfdec.c -> ffmpeg-1.2.9.tar.bz2/libavformat/swfdec.c Changed

@@ -283,6 +283,7 @@
             const int bmp_fmt = avio_r8(pb);
             const int width   = avio_rl16(pb);
             const int height  = avio_rl16(pb);
+            int pix_fmt;
 
             len -= 2+1+2+2;
 
@@ -347,17 +348,21 @@
                 avpriv_set_pts_info(vst, 64, 256, swf->frame_rate);
                 st = vst;
             }
-            st->codec->width  = width;
-            st->codec->height = height;
 
             if ((res = av_new_packet(pkt, out_len - colormapsize * colormapbpp)) < 0)
                 goto bitmap_end;
+            if (!st->codec->width && !st->codec->height) {
+                st->codec->width  = width;
+                st->codec->height = height;
+            } else {
+                ff_add_param_change(pkt, 0, 0, 0, width, height);
+            }
             pkt->pos = pos;
             pkt->stream_index = st->index;
 
             switch (bmp_fmt) {
             case 3:
-                st->codec->pix_fmt = AV_PIX_FMT_PAL8;
+                pix_fmt = AV_PIX_FMT_PAL8;
                 for (i = 0; i < colormapsize; i++)
                     if (alpha_bmp)  colormap[i] = buf[3]<<24 | AV_RB24(buf + 4*i);
                     else            colormap[i] = 0xffU <<24 | AV_RB24(buf + 3*i);
@@ -369,14 +374,20 @@
                 memcpy(pal, colormap, AVPALETTE_SIZE);
                 break;
             case 4:
-                st->codec->pix_fmt = AV_PIX_FMT_RGB555;
+                pix_fmt = AV_PIX_FMT_RGB555;
                 break;
             case 5:
-                st->codec->pix_fmt = alpha_bmp ? AV_PIX_FMT_ARGB : AV_PIX_FMT_0RGB;
+                pix_fmt = alpha_bmp ? AV_PIX_FMT_ARGB : AV_PIX_FMT_0RGB;
                 break;
             default:
                 av_assert0(0);
             }
+            if (st->codec->pix_fmt != AV_PIX_FMT_NONE && st->codec->pix_fmt != pix_fmt) {
+                av_log(s, AV_LOG_ERROR, "pixel format change unsupported\n");
+                res = AVERROR_PATCHWELCOME;
+                goto bitmap_end;
+            }
+            st->codec->pix_fmt = pix_fmt;
 
             if (linesize * height > pkt->size) {
                 res = AVERROR_INVALIDDATA;

ffmpeg-1.2.8.tar.bz2/libavutil/x86/cpu.c -> ffmpeg-1.2.9.tar.bz2/libavutil/x86/cpu.c Changed

ffmpeg-1.2.8.tar.bz2/libswresample/swresample.c -> ffmpeg-1.2.9.tar.bz2/libswresample/swresample.c Changed

Build Results
RPM Lint

Refresh

Comments for request 1236 0

Request History

enzokiel created request about 10 years ago

- update internal ffmpeg to version 1.2.9

olh accepted request about 10 years ago

Maybe there is a chance to change all/most BuildRequires: from somelib-devel to pkgconfig(somelib), that may fix build in older dists. And make gtk3 optional, if possible.