@@ -1,4 +1,8 @@

 -------------------------------------------------------------------

+Wed Mar 12 2014 - joerg.lorenzen@ki.tng.de

+- update internal ffmpeg to version 1.2.6

+

+-------------------------------------------------------------------

 Sat Feb 01 2014 - joerg.lorenzen@ki.tng.de

 - update internal ffmpeg to version 1.2.5

​

@@ -16,7 +16,7 @@

 #

-%define         ffmpeg_version 1.2.5

+%define         ffmpeg_version 1.2.6

 Name:           avidemux3

 Summary:        Graphical video editing and transcoding tool

​

@@ -1,1 +1,1 @@

-1.2.5

+1.2.6

​

@@ -1,1 +1,1 @@

-1.2.5

+1.2.6

​

@@ -31,7 +31,7 @@

 # This could be handy for archiving the generated documentation or

 # if some version control system is used.

-PROJECT_NUMBER         = 1.2.5

+PROJECT_NUMBER         = 1.2.6

 # With the PROJECT_LOGO tag one can specify an logo or icon that is included

 # in the documentation. The maximum height of the logo should not exceed 55

​

@@ -189,6 +189,9 @@

         }

     }

+    if (!avctx->channels)

+        return 1;

+

     /* get output buffer */

     ac->frame->nb_samples = 2048;

     if ((ret = ff_get_buffer(avctx, ac->frame)) < 0) {

​

@@ -419,7 +419,7 @@

             switch(buf[0]) {

             case '0': case '1': case '2': case '3': case '4':

             case '5': case '6': case '7': case '8': case '9':

-                if (s->nb_args < MAX_NB_ARGS)

+                if (s->nb_args < MAX_NB_ARGS && s->args[s->nb_args] < 6553)

                     s->args[s->nb_args] = FFMAX(s->args[s->nb_args], 0) * 10 + buf[0] - '0';

                 break;

             case ';':

​

@@ -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;

 }

​

@@ -236,7 +236,7 @@

 static int dnxhd_init_rc(DNXHDEncContext *ctx)

 {

-    FF_ALLOCZ_OR_GOTO(ctx->m.avctx, ctx->mb_rc, 8160*ctx->m.avctx->qmax*sizeof(RCEntry), fail);

+    FF_ALLOCZ_OR_GOTO(ctx->m.avctx, ctx->mb_rc, 8160*(ctx->m.avctx->qmax + 1)*sizeof(RCEntry), fail);

     if (ctx->m.avctx->mb_decision != FF_MB_DECISION_RD)

         FF_ALLOCZ_OR_GOTO(ctx->m.avctx, ctx->mb_cmp, ctx->m.mb_num*sizeof(RCCMPEntry), fail);

​

@@ -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;

     }

​

@@ -34,6 +34,7 @@

 #include "avcodec.h"

 #include "msrledec.h"

+#include "libavutil/imgutils.h"

 typedef struct MsrleContext {

     AVCodecContext *avctx;

@@ -112,7 +113,7 @@

     /* FIXME how to correctly detect RLE ??? */

     if (avctx->height * istride == avpkt->size) { /* assume uncompressed */

-        int linesize = (avctx->width * avctx->bits_per_coded_sample + 7) / 8;

+        int linesize = av_image_get_linesize(avctx->pix_fmt, avctx->width, 0);

         uint8_t *ptr = s->frame.data[0];

         uint8_t *buf = avpkt->data + (avctx->height-1)*istride;

         int i, j;

​

@@ -912,8 +912,6 @@

     if (fctx->prev_thread) {

         if (fctx->prev_thread != &fctx->threads[0])

             update_context_from_thread(fctx->threads[0].avctx, fctx->prev_thread->avctx, 0);

-        if (avctx->codec->flush)

-            avctx->codec->flush(fctx->threads[0].avctx);

     }

     fctx->next_decoding = fctx->next_finished = 0;

@@ -925,6 +923,9 @@

         p->got_frame = 0;

         release_delayed_buffers(p);

+

+        if (avctx->codec->flush)

+            avctx->codec->flush(fctx->threads[0].avctx);

     }

 }

​

@@ -315,7 +315,8 @@

         if(!sliced && !offset_dst)

             dst -= src_x;

         src_x=0;

-    }else if(src_x + b_w > w){

+    }

+    if(src_x + b_w > w){

         b_w = w - src_x;

     }

     if(src_y<0){

@@ -324,7 +325,8 @@

         if(!sliced && !offset_dst)

             dst -= src_y*dst_stride;

         src_y=0;

-    }else if(src_y + b_h> h){

+    }

+    if(src_y + b_h> h){

         b_h = h - src_y;

     }

​

@@ -732,11 +732,9 @@

         return AVERROR_INVALIDDATA;

     }

-    if (s->ti.bps != avctx->bits_per_raw_sample) {

-        avctx->bits_per_raw_sample = s->ti.bps;

-        if ((ret = set_bps_params(avctx)) < 0)

-            return ret;

-    }

+    avctx->bits_per_raw_sample = s->ti.bps;

+    if ((ret = set_bps_params(avctx)) < 0)

+        return ret;

     if (s->ti.sample_rate != avctx->sample_rate) {

         avctx->sample_rate = s->ti.sample_rate;

         set_sample_rate_params(avctx);

​

@@ -468,7 +468,7 @@

          * get the offset in bits and convert to bytes.

          */

         offset += write_huff_codes(dst + sstart * width, c->slice_bits,

-                                   width * (send - sstart), width,

+                                   width * height + 4, width,

                                    send - sstart, he) >> 3;

         slice_len = offset - slice_len;

@@ -525,8 +525,7 @@

     bytestream2_init_writer(&pb, dst, pkt->size);

-    av_fast_malloc(&c->slice_bits, &c->slice_bits_size,

-                   width * height + FF_INPUT_BUFFER_PADDING_SIZE);

+    av_fast_padded_malloc(&c->slice_bits, &c->slice_bits_size, width * height + 4);

     if (!c->slice_bits) {

         av_log(avctx, AV_LOG_ERROR, "Cannot allocate temporary buffer 2.\n");

​

@@ -580,6 +580,8 @@

 {

     int pqindex, lowquant, status;

+    v->field_mode = 0;

+    v->fcm = 0;

     if (v->finterpflag)

         v->interpfrm = get_bits1(gb);

     if (!v->s.avctx->codec)

​

@@ -276,6 +276,11 @@

                     }

                     xy = *src++;

                     wh = *src++;

+                    if (   (xy >> 4) + (wh >> 4) + 1 > w - i

+                        || (xy & 0xF) + (wh & 0xF)+1 > h - j) {

+                        av_log(c->avctx, AV_LOG_ERROR, "Rectangle outside picture\n");

+                        return AVERROR_INVALIDDATA;

+                    }

                     paint_rect(dst2, xy >> 4, xy & 0xF, (wh>>4)+1, (wh & 0xF)+1, fg, bpp, stride);

                 }

             }

​

@@ -127,8 +127,8 @@

     int8_t  mclms_order;

     int8_t  mclms_scaling;

-    int16_t mclms_coeffs[128];

-    int16_t mclms_coeffs_cur[4];

+    int16_t mclms_coeffs[WMALL_MAX_CHANNELS * WMALL_MAX_CHANNELS * 32];

+    int16_t mclms_coeffs_cur[WMALL_MAX_CHANNELS * WMALL_MAX_CHANNELS];

     int16_t mclms_prevvalues[WMALL_MAX_CHANNELS * 2 * 32];

     int16_t mclms_updates[WMALL_MAX_CHANNELS * 2 * 32];

     int     mclms_recent;

​

@@ -327,6 +327,7 @@

                 uint16_t size = avio_rl16(s->pb);

                 const char *name = NULL;

                 char buffer[64] = {0};

+                size = FFMIN(size, tag_end - avio_tell(s->pb));

                 size -= avio_read(s->pb, buffer,

                                    FFMIN(size, sizeof(buffer)-1));

                 switch (tag) {

​

@@ -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 */

​

@@ -144,6 +144,8 @@

                 if (s->streams[stream_index]->id == rt->asf_ctx->streams[i]->id) {

                     *s->streams[stream_index]->codec =

                         *rt->asf_ctx->streams[i]->codec;

+                    s->streams[stream_index]->need_parsing =

+                        rt->asf_ctx->streams[i]->need_parsing;

                     rt->asf_ctx->streams[i]->codec->extradata_size = 0;

                     rt->asf_ctx->streams[i]->codec->extradata = NULL;

                     avpriv_set_pts_info(s->streams[stream_index], 32, 1, 1000);

​

@@ -135,6 +135,8 @@

     /* auto-select alignment if not specified */

     if (!align) {

+        if (nb_samples > INT_MAX - 31)

+            return AVERROR(EINVAL);

         align = 1;

         nb_samples = FFALIGN(nb_samples, 32);

     }

​