Request 942 (accepted)

Overview

Request 942 (accepted)

- update internal ffmpeg to version 0.9.4

Created by enzokiel about 10 years ago
In state accepted
Package maintainers: detrei and enzokiel

Submit avidemux

Submit package home:enzokiel:b...hes:Multimedia / avidemux to package Multimedia / avidemux

avidemux.changes Changed

avidemux.spec Changed

ffmpeg-0.9.3.tar.bz2/Doxyfile -> ffmpeg-0.9.4.tar.bz2/Doxyfile Changed

ffmpeg-0.9.3.tar.bz2/RELEASE -> ffmpeg-0.9.4.tar.bz2/RELEASE Changed

ffmpeg-0.9.3.tar.bz2/VERSION -> ffmpeg-0.9.4.tar.bz2/VERSION Changed

ffmpeg-0.9.3.tar.bz2/cmdutils.c -> ffmpeg-0.9.4.tar.bz2/cmdutils.c Changed

ffmpeg-0.9.3.tar.bz2/libavcodec/arm/int_neon.S -> ffmpeg-0.9.4.tar.bz2/libavcodec/arm/int_neon.S Changed

ffmpeg-0.9.3.tar.bz2/libavcodec/dnxhdenc.c -> ffmpeg-0.9.4.tar.bz2/libavcodec/dnxhdenc.c Changed

ffmpeg-0.9.3.tar.bz2/libavcodec/h264_refs.c -> ffmpeg-0.9.4.tar.bz2/libavcodec/h264_refs.c Changed

@@ -516,7 +516,7 @@
             if(!pic){
                 if(mmco[i].opcode != MMCO_SHORT2LONG || !h->long_ref[mmco[i].long_arg]
                    || h->long_ref[mmco[i].long_arg]->frame_num != frame_num) {
-                    av_log(h->s.avctx, AV_LOG_ERROR, "mmco: unref short failure\n");
+                    av_log(h->s.avctx, h->short_ref_count ? AV_LOG_ERROR : AV_LOG_DEBUG, "mmco: unref short failure\n");
                     err = AVERROR_INVALIDDATA;
                 }
                 continue;
@@ -653,7 +653,7 @@
     print_short_term(h);
     print_long_term(h);
 
-    if(err >= 0 && h->long_ref_count==0 && h->short_ref_count<=2 && h->pps.ref_count[0]<=1 + (s->picture_structure != PICT_FRAME) && s->current_picture_ptr->f.pict_type == AV_PICTURE_TYPE_I){
+    if(err >= 0 && h->long_ref_count==0 && h->short_ref_count<=2 && h->pps.ref_count[0]<=2 + (s->picture_structure != PICT_FRAME) && s->current_picture_ptr->f.pict_type == AV_PICTURE_TYPE_I){
         s->current_picture_ptr->sync |= 1;
         if(!h->s.avctx->has_b_frames)
             h->sync = 2;

ffmpeg-0.9.3.tar.bz2/libavcodec/jpeglsdec.c -> ffmpeg-0.9.4.tar.bz2/libavcodec/jpeglsdec.c Changed

ffmpeg-0.9.3.tar.bz2/libavcodec/msrle.c -> ffmpeg-0.9.4.tar.bz2/libavcodec/msrle.c Changed

ffmpeg-0.9.3.tar.bz2/libavcodec/parser.c -> ffmpeg-0.9.4.tar.bz2/libavcodec/parser.c Changed

ffmpeg-0.9.3.tar.bz2/libavcodec/snow.h -> ffmpeg-0.9.4.tar.bz2/libavcodec/snow.h Changed

ffmpeg-0.9.3.tar.bz2/libavcodec/vc1.c -> ffmpeg-0.9.4.tar.bz2/libavcodec/vc1.c Changed

ffmpeg-0.9.3.tar.bz2/libavcodec/vmnc.c -> ffmpeg-0.9.4.tar.bz2/libavcodec/vmnc.c Changed

ffmpeg-0.9.3.tar.bz2/libavcodec/vorbisdec.c -> ffmpeg-0.9.4.tar.bz2/libavcodec/vorbisdec.c Changed

ffmpeg-0.9.3.tar.bz2/libavcodec/wmalosslessdec.c -> ffmpeg-0.9.4.tar.bz2/libavcodec/wmalosslessdec.c Changed

ffmpeg-0.9.3.tar.bz2/libavfilter/avfilter.c -> ffmpeg-0.9.4.tar.bz2/libavfilter/avfilter.c Changed

ffmpeg-0.9.3.tar.bz2/libavformat/mpegtsenc.c -> ffmpeg-0.9.4.tar.bz2/libavformat/mpegtsenc.c Changed

@@ -232,7 +232,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;
@@ -285,6 +285,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;
@@ -308,7 +312,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 */
@@ -370,6 +374,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-0.9.3.tar.bz2/libavformat/utils.c -> ffmpeg-0.9.4.tar.bz2/libavformat/utils.c Changed

Build Results
RPM Lint

Refresh

Comments for request 942 0

Request History

enzokiel created request about 10 years ago

- update internal ffmpeg to version 0.9.4

jsjhb accepted request about 10 years ago