Projects
Multimedia
avidemux
Sign Up
Log In
Username
Password
Overview
Repositories
Revisions
Requests
Users
Attributes
Meta
Expand all
Collapse all
Changes of Revision 9
View file
avidemux.changes
Changed
@@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Tue Mar 25 19:03:38 UTC 2014 - joerg.lorenzen@ki.tng.de + +- update internal ffmpeg to version 0.9.4 + +------------------------------------------------------------------- Sun Mar 16 15:13:23 UTC 2014 - joerg.lorenzen@ki.tng.de - build against libvpx
View file
avidemux.spec
Changed
@@ -16,7 +16,7 @@ # -%define ffmpeg_version 0.9.3 +%define ffmpeg_version 0.9.4 Name: avidemux Summary: Video processing tool
View file
ffmpeg-0.9.3.tar.bz2/Doxyfile -> ffmpeg-0.9.4.tar.bz2/Doxyfile
Changed
@@ -31,7 +31,7 @@ # This could be handy for archiving the generated documentation or # if some version control system is used. -PROJECT_NUMBER = 0.9.3 +PROJECT_NUMBER = 0.9.4 # The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) # base path where the generated documentation will be put.
View file
ffmpeg-0.9.3.tar.bz2/RELEASE -> ffmpeg-0.9.4.tar.bz2/RELEASE
Changed
@@ -1,1 +1,1 @@ -0.9.3 +0.9.4
View file
ffmpeg-0.9.3.tar.bz2/VERSION -> ffmpeg-0.9.4.tar.bz2/VERSION
Changed
@@ -1,1 +1,1 @@ -0.9.3 +0.9.4
View file
ffmpeg-0.9.3.tar.bz2/cmdutils.c -> ffmpeg-0.9.4.tar.bz2/cmdutils.c
Changed
@@ -53,7 +53,7 @@ struct SwsContext *sws_opts; AVDictionary *format_opts, *codec_opts; -static const int this_year = 2013; +static const int this_year = 2014; static FILE *report_file;
View file
ffmpeg-0.9.3.tar.bz2/libavcodec/arm/int_neon.S -> ffmpeg-0.9.4.tar.bz2/libavcodec/arm/int_neon.S
Changed
@@ -66,10 +66,10 @@ 3: vpadd.s32 d16, d0, d1 vpadd.s32 d17, d2, d3 - vpadd.s32 d10, d4, d5 - vpadd.s32 d11, d6, d7 + vpadd.s32 d18, d4, d5 + vpadd.s32 d19, d6, d7 vpadd.s32 d0, d16, d17 - vpadd.s32 d1, d10, d11 + vpadd.s32 d1, d18, d19 vpadd.s32 d2, d0, d1 vpaddl.s32 d3, d2 vmov.32 r0, d3[0] @@ -106,10 +106,10 @@ vpadd.s32 d16, d0, d1 vpadd.s32 d17, d2, d3 - vpadd.s32 d10, d4, d5 - vpadd.s32 d11, d6, d7 + vpadd.s32 d18, d4, d5 + vpadd.s32 d19, d6, d7 vpadd.s32 d0, d16, d17 - vpadd.s32 d1, d10, d11 + vpadd.s32 d1, d18, d19 vpadd.s32 d2, d0, d1 vpaddl.s32 d3, d2 vmov.32 r0, d3[0]
View file
ffmpeg-0.9.3.tar.bz2/libavcodec/dnxhdenc.c -> ffmpeg-0.9.4.tar.bz2/libavcodec/dnxhdenc.c
Changed
@@ -220,7 +220,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);
View file
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;
View file
ffmpeg-0.9.3.tar.bz2/libavcodec/jpeglsdec.c -> ffmpeg-0.9.4.tar.bz2/libavcodec/jpeglsdec.c
Changed
@@ -143,6 +143,8 @@ ret = ret >> 1; } + if(FFABS(ret) > 0xFFFF) + return -0x10000; /* update state */ state->A[Q] += FFABS(ret) - RItype; ret *= state->twonear;
View file
ffmpeg-0.9.3.tar.bz2/libavcodec/msrle.c -> ffmpeg-0.9.4.tar.bz2/libavcodec/msrle.c
Changed
@@ -35,6 +35,7 @@ #include "avcodec.h" #include "dsputil.h" #include "msrledec.h" +#include "libavutil/imgutils.h" typedef struct MsrleContext { AVCodecContext *avctx; @@ -107,7 +108,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;
View file
ffmpeg-0.9.3.tar.bz2/libavcodec/parser.c -> ffmpeg-0.9.4.tar.bz2/libavcodec/parser.c
Changed
@@ -241,8 +241,10 @@ if(next == END_NOT_FOUND){ void* new_buffer = av_fast_realloc(pc->buffer, &pc->buffer_size, (*buf_size) + pc->index + FF_INPUT_BUFFER_PADDING_SIZE); - if(!new_buffer) + if(!new_buffer) { + pc->index = 0; return AVERROR(ENOMEM); + } pc->buffer = new_buffer; memcpy(&pc->buffer[pc->index], *buf, *buf_size); pc->index += *buf_size; @@ -255,9 +257,11 @@ /* append to buffer */ if(pc->index){ void* new_buffer = av_fast_realloc(pc->buffer, &pc->buffer_size, next + pc->index + FF_INPUT_BUFFER_PADDING_SIZE); - - if(!new_buffer) + if(!new_buffer) { + pc->overread_index = + pc->index = 0; return AVERROR(ENOMEM); + } pc->buffer = new_buffer; memcpy(&pc->buffer[pc->index], *buf, next + FF_INPUT_BUFFER_PADDING_SIZE ); pc->index = 0;
View file
ffmpeg-0.9.3.tar.bz2/libavcodec/snow.h -> ffmpeg-0.9.4.tar.bz2/libavcodec/snow.h
Changed
@@ -311,7 +311,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){ @@ -320,7 +321,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; }
View file
ffmpeg-0.9.3.tar.bz2/libavcodec/vc1.c -> ffmpeg-0.9.4.tar.bz2/libavcodec/vc1.c
Changed
@@ -578,6 +578,8 @@ { int pqindex, lowquant, status; + v->field_mode = 0; + v->fcm = 0; if (v->finterpflag) v->interpfrm = get_bits1(gb); skip_bits(gb, 2); //framecnt unused
View file
ffmpeg-0.9.3.tar.bz2/libavcodec/vmnc.c -> ffmpeg-0.9.4.tar.bz2/libavcodec/vmnc.c
Changed
@@ -275,6 +275,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); } }
View file
ffmpeg-0.9.3.tar.bz2/libavcodec/vorbisdec.c -> ffmpeg-0.9.4.tar.bz2/libavcodec/vorbisdec.c
Changed
@@ -595,6 +595,10 @@ "Floor 0 amplitude bits is 0.\n"); return AVERROR_INVALIDDATA; } + if (floor_setup->data.t0.bark_map_size == 0) { + av_log(vc->avccontext, AV_LOG_ERROR, "Floor 0 bark map size is 0.\n"); + return AVERROR_INVALIDDATA; + } floor_setup->data.t0.amplitude_offset = get_bits(gb, 8); floor_setup->data.t0.num_books = get_bits(gb, 4) + 1;
View file
ffmpeg-0.9.3.tar.bz2/libavcodec/wmalosslessdec.c -> ffmpeg-0.9.4.tar.bz2/libavcodec/wmalosslessdec.c
Changed
@@ -235,11 +235,11 @@ int8_t mclms_order; int8_t mclms_scaling; - int16_t mclms_coeffs[128]; - int16_t mclms_coeffs_cur[4]; - int16_t mclms_prevvalues[64]; // FIXME: should be 32-bit / 16-bit depending on bit-depth - int16_t mclms_updates[64]; - int mclms_recent; + 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; int movave_scaling; int quant_stepsize;
View file
ffmpeg-0.9.3.tar.bz2/libavfilter/avfilter.c -> ffmpeg-0.9.4.tar.bz2/libavfilter/avfilter.c
Changed
@@ -140,9 +140,9 @@ (*links)[idx] = NULL; (*count)++; - for (i = idx+1; i < *count; i++) - if (*links[i]) - (*(unsigned *)((uint8_t *) *links[i] + padidx_off))++; + for (i = idx + 1; i < *count; i++) + if ((*links)[i]) + (*(unsigned *)((uint8_t *) (*links)[i] + padidx_off))++; } int avfilter_link(AVFilterContext *src, unsigned srcpad,
View file
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 */
View file
ffmpeg-0.9.3.tar.bz2/libavformat/utils.c -> ffmpeg-0.9.4.tar.bz2/libavformat/utils.c
Changed
@@ -1076,12 +1076,14 @@ if (pkt->dts != AV_NOPTS_VALUE) { // got DTS from the stream, update reference timestamp st->reference_dts = pkt->dts - pc->dts_ref_dts_delta * num / den; - pkt->pts = pkt->dts + pc->pts_dts_delta * num / den; } else if (st->reference_dts != AV_NOPTS_VALUE) { // compute DTS based on reference timestamp pkt->dts = st->reference_dts + pc->dts_ref_dts_delta * num / den; - pkt->pts = pkt->dts + pc->pts_dts_delta * num / den; } + + if (st->reference_dts != AV_NOPTS_VALUE && pkt->pts == AV_NOPTS_VALUE) + pkt->pts = pkt->dts + pc->pts_dts_delta * num / den; + if (pc->dts_sync_point > 0) st->reference_dts = pkt->dts; // new reference }
Locations
Projects
Search
Status Monitor
Help
Open Build Service
OBS Manuals
API Documentation
OBS Portal
Reporting a Bug
Contact
Mailing List
Forums
Chat (IRC)
Twitter
Open Build Service (OBS)
is an
openSUSE project
.