Request 924 (accepted)

Overview

Request 924 (accepted)

- update internal ffmpeg to version 1.2.6

Created by enzokiel almost 11 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.5.tar.bz2/RELEASE -> ffmpeg-1.2.6.tar.bz2/RELEASE Changed

ffmpeg-1.2.5.tar.bz2/VERSION -> ffmpeg-1.2.6.tar.bz2/VERSION Changed

ffmpeg-1.2.5.tar.bz2/doc/Doxyfile -> ffmpeg-1.2.6.tar.bz2/doc/Doxyfile Changed

ffmpeg-1.2.5.tar.bz2/libavcodec/aacdec.c -> ffmpeg-1.2.6.tar.bz2/libavcodec/aacdec.c Changed

ffmpeg-1.2.5.tar.bz2/libavcodec/ansi.c -> ffmpeg-1.2.6.tar.bz2/libavcodec/ansi.c Changed

ffmpeg-1.2.5.tar.bz2/libavcodec/arm/dca.h -> ffmpeg-1.2.6.tar.bz2/libavcodec/arm/dca.h Changed

@@ -34,46 +34,44 @@
 {
     int v0, v1, v2, v3, v4, v5;
 
-    __asm__ ("smmul   %8,  %14, %18           \n"
-             "smmul   %11, %15, %18           \n"
-             "smlabb  %14, %8,  %17, %14      \n"
-             "smlabb  %15, %11, %17, %15      \n"
-             "smmul   %9,  %8,  %18           \n"
-             "smmul   %12, %11, %18           \n"
-             "sub     %14, %14, %16, lsr #1   \n"
-             "sub     %15, %15, %16, lsr #1   \n"
-             "smlabb  %8,  %9,  %17, %8       \n"
-             "smlabb  %11, %12, %17, %11      \n"
-             "smmul   %10, %9,  %18           \n"
-             "smmul   %13, %12, %18           \n"
-             "str     %14, %0                 \n"
-             "str     %15, %4                 \n"
-             "sub     %8,  %8,  %16, lsr #1   \n"
-             "sub     %11, %11, %16, lsr #1   \n"
-             "smlabb  %9,  %10, %17, %9       \n"
-             "smlabb  %12, %13, %17, %12      \n"
-             "smmul   %14, %10, %18           \n"
-             "smmul   %15, %13, %18           \n"
-             "str     %8,  %1                 \n"
-             "str     %11, %5                 \n"
-             "sub     %9,  %9,  %16, lsr #1   \n"
-             "sub     %12, %12, %16, lsr #1   \n"
-             "smlabb  %10, %14, %17, %10      \n"
-             "smlabb  %13, %15, %17, %13      \n"
-             "str     %9,  %2                 \n"
-             "str     %12, %6                 \n"
-             "sub     %10, %10, %16, lsr #1   \n"
-             "sub     %13, %13, %16, lsr #1   \n"
-             "str     %10, %3                 \n"
-             "str     %13, %7                 \n"
-             : "=m"(values[0]), "=m"(values[1]),
-               "=m"(values[2]), "=m"(values[3]),
-               "=m"(values[4]), "=m"(values[5]),
-               "=m"(values[6]), "=m"(values[7]),
-               "=&r"(v0), "=&r"(v1), "=&r"(v2),
+    __asm__ ("smmul   %0,  %6,  %10           \n"
+             "smmul   %3,  %7,  %10           \n"
+             "smlabb  %6,  %0,  %9,  %6       \n"
+             "smlabb  %7,  %3,  %9,  %7       \n"
+             "smmul   %1,  %0,  %10           \n"
+             "smmul   %4,  %3,  %10           \n"
+             "sub     %6,  %6,  %8,  lsr #1   \n"
+             "sub     %7,  %7,  %8,  lsr #1   \n"
+             "smlabb  %0,  %1,  %9,  %0       \n"
+             "smlabb  %3,  %4,  %9,  %3       \n"
+             "smmul   %2,  %1,  %10           \n"
+             "smmul   %5,  %4,  %10           \n"
+             "str     %6,  [%11, #0]          \n"
+             "str     %7,  [%11, #16]         \n"
+             "sub     %0,  %0,  %8,  lsr #1   \n"
+             "sub     %3,  %3,  %8,  lsr #1   \n"
+             "smlabb  %1,  %2,  %9,  %1       \n"
+             "smlabb  %4,  %5,  %9,  %4       \n"
+             "smmul   %6,  %2,  %10           \n"
+             "smmul   %7,  %5,  %10           \n"
+             "str     %0,  [%11, #4]          \n"
+             "str     %3,  [%11, #20]         \n"
+             "sub     %1,  %1,  %8,  lsr #1   \n"
+             "sub     %4,  %4,  %8,  lsr #1   \n"
+             "smlabb  %2,  %6,  %9,  %2       \n"
+             "smlabb  %5,  %7,  %9,  %5       \n"
+             "str     %1,  [%11, #8]          \n"
+             "str     %4,  [%11, #24]         \n"
+             "sub     %2,  %2,  %8,  lsr #1   \n"
+             "sub     %5,  %5,  %8,  lsr #1   \n"
+             "str     %2,  [%11, #12]         \n"
+             "str     %5,  [%11, #28]         \n"
+             : "=&r"(v0), "=&r"(v1), "=&r"(v2),
                "=&r"(v3), "=&r"(v4), "=&r"(v5),
                "+&r"(code1), "+&r"(code2)
-             : "r"(levels - 1), "r"(-levels), "r"(ff_inverse[levels]));
+             : "r"(levels - 1), "r"(-levels),
+               "r"(ff_inverse[levels]), "r"(values)
+             : "memory");
 
     return code1 | code2;
 }

ffmpeg-1.2.5.tar.bz2/libavcodec/dnxhdenc.c -> ffmpeg-1.2.6.tar.bz2/libavcodec/dnxhdenc.c Changed

ffmpeg-1.2.5.tar.bz2/libavcodec/mjpegdec.c -> ffmpeg-1.2.6.tar.bz2/libavcodec/mjpegdec.c Changed

@@ -329,7 +329,7 @@
         s->first_picture = 0;
     }
 
-    if (s->interlaced && (s->bottom_field == !s->interlace_polarity)) {
+    if (s->got_picture && s->interlaced && (s->bottom_field == !s->interlace_polarity)) {
         if (s->progressive) {
             av_log_ask_for_sample(s->avctx, "progressively coded interlaced pictures not supported\n");
             return AVERROR_INVALIDDATA;
@@ -1596,8 +1596,6 @@
         int t = 0, b = 0;
         PutBitContext pb;
 
-        s->cur_scan++;
-
         /* find marker */
         while (src + t < buf_end) {
             uint8_t x = src[t++];
@@ -1661,7 +1659,7 @@
                                           &unescaped_buf_size);
         /* EOF */
         if (start_code < 0) {
-            goto the_end;
+            break;
         } else if (unescaped_buf_size > (1U<<28)) {
             av_log(avctx, AV_LOG_ERROR, "MJPEG packet 0x%x too big (0x%x/0x%x), corrupt data?\n",
                    start_code, unescaped_buf_size, buf_size);
@@ -1771,6 +1769,7 @@
 
                 goto the_end;
             case SOS:
+                s->cur_scan++;
                 if ((ret = ff_mjpeg_decode_sos(s, NULL, NULL)) < 0 &&
                     (avctx->err_recognition & AV_EF_EXPLODE))
                     goto fail;
@@ -1800,7 +1799,7 @@
                    (get_bits_count(&s->gb) + 7) / 8, get_bits_count(&s->gb));
         }
     }
-    if (s->got_picture) {
+    if (s->got_picture && s->cur_scan) {
         av_log(avctx, AV_LOG_WARNING, "EOI missing, emulating\n");
         goto eoi_parser;
     }

ffmpeg-1.2.5.tar.bz2/libavcodec/msrle.c -> ffmpeg-1.2.6.tar.bz2/libavcodec/msrle.c Changed

ffmpeg-1.2.5.tar.bz2/libavcodec/pthread.c -> ffmpeg-1.2.6.tar.bz2/libavcodec/pthread.c Changed

ffmpeg-1.2.5.tar.bz2/libavcodec/snow.h -> ffmpeg-1.2.6.tar.bz2/libavcodec/snow.h Changed

ffmpeg-1.2.5.tar.bz2/libavcodec/takdec.c -> ffmpeg-1.2.6.tar.bz2/libavcodec/takdec.c Changed

ffmpeg-1.2.5.tar.bz2/libavcodec/utvideoenc.c -> ffmpeg-1.2.6.tar.bz2/libavcodec/utvideoenc.c Changed

ffmpeg-1.2.5.tar.bz2/libavcodec/vc1.c -> ffmpeg-1.2.6.tar.bz2/libavcodec/vc1.c Changed

ffmpeg-1.2.5.tar.bz2/libavcodec/vmnc.c -> ffmpeg-1.2.6.tar.bz2/libavcodec/vmnc.c Changed

ffmpeg-1.2.5.tar.bz2/libavcodec/wmalosslessdec.c -> ffmpeg-1.2.6.tar.bz2/libavcodec/wmalosslessdec.c Changed

ffmpeg-1.2.5.tar.bz2/libavformat/avidec.c -> ffmpeg-1.2.6.tar.bz2/libavformat/avidec.c Changed

ffmpeg-1.2.5.tar.bz2/libavformat/mpegtsenc.c -> ffmpeg-1.2.6.tar.bz2/libavformat/mpegtsenc.c Changed

@@ -255,7 +255,7 @@
                           data, q - data);
 }
 
-static void mpegts_write_pmt(AVFormatContext *s, MpegTSService *service)
+static int mpegts_write_pmt(AVFormatContext *s, MpegTSService *service)
 {
     MpegTSWrite *ts = s->priv_data;
     uint8_t data[1012], *q, *desc_length_ptr, *program_info_length_ptr;
@@ -308,6 +308,10 @@
             stream_type = STREAM_TYPE_PRIVATE_DATA;
             break;
         }
+
+        if (q - data > sizeof(data) - 32)
+            return AVERROR(EINVAL);
+
         *q++ = stream_type;
         put16(&q, 0xe000 | ts_st->pid);
         desc_length_ptr = q;
@@ -339,7 +343,7 @@
                 len_ptr = q++;
                 *len_ptr = 0;
 
-                for (p = lang->value; next && *len_ptr < 255 / 4 * 4; p = next + 1) {
+                for (p = lang->value; next && *len_ptr < 255 / 4 * 4 && q - data < sizeof(data) - 4; p = next + 1) {
                     next = strchr(p, ',');
                     if (strlen(p) != 3 && (!next || next != p + 3))
                         continue; /* not a 3-letter code */
@@ -401,6 +405,7 @@
     }
     mpegts_write_section1(&service->pmt, PMT_TID, service->sid, 0, 0, 0,
                           data, q - data);
+    return 0;
 }
 
 /* NOTE: str == NULL is accepted for an empty string */

ffmpeg-1.2.5.tar.bz2/libavformat/rtpdec_asf.c -> ffmpeg-1.2.6.tar.bz2/libavformat/rtpdec_asf.c Changed

ffmpeg-1.2.5.tar.bz2/libavutil/samplefmt.c -> ffmpeg-1.2.6.tar.bz2/libavutil/samplefmt.c Changed

Build Results
RPM Lint

Refresh

Comments for request 924 0

Request History

enzokiel created request almost 11 years ago

- update internal ffmpeg to version 1.2.6

jsjhb accepted request almost 11 years ago